diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e98d8aa5b..1d7da460a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,10 +11,8 @@ jobs: include: - name: Ubuntu 18.04 (gcc) os: ubuntu-18.04 - # FFMPEG version on 18.04 is too old cmake_args: >- -DFAAD=ON - -DFFMPEG=OFF -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index 84edfaf36b..3b606c19d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2240,7 +2240,7 @@ endif() # FFmpeg 4.x support # FFmpeg is multimedia library that can be found http://ffmpeg.org/ find_package(FFMPEG COMPONENTS libavcodec libavformat libavutil libswresample) -cmake_dependent_option(FFMPEG "FFmpeg 4.x support" ON "FFMPEG_FOUND" OFF) +cmake_dependent_option(FFMPEG "FFmpeg 4.x support" ON "FFMPEG_FOUND;FFMPEG_libavcodec_VERSION VERSION_GREATER_EQUAL 58" OFF) if(FFMPEG) if(NOT FFMPEG_libavcodec_FOUND) message(FATAL_ERROR "FFmpeg support requires libavcodec and its development headers.") |