Skip to content

Commit

Permalink
Revert "Force CMake version 3.21.0+ for the FFMPEG extension"
Browse files Browse the repository at this point in the history
This reverts commit dadfea0.
  • Loading branch information
moneytoo committed Jun 17, 2022
1 parent 8fed436 commit 9439e75
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions extensions/ffmpeg/build.gradle
Expand Up @@ -17,8 +17,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
// failures if ffmpeg hasn't been built according to the README instructions.
if (project.file('src/main/jni/ffmpeg').exists()) {
android.externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt'
// Should match cmake_minimum_required.
android.externalNativeBuild.cmake.version = '3.21.0+'
android.externalNativeBuild.cmake.version = '3.7.1+'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion extensions/ffmpeg/src/main/jni/CMakeLists.txt
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)

# Enable C++11 features.
set(CMAKE_CXX_STANDARD 11)
Expand Down

0 comments on commit 9439e75

Please sign in to comment.