citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4960 from zhaowenlan1779/ffmpeg-cmake-fix 

CMakeLists: Fix `find_package` call
This commit is contained in:
Weiyi Wang 2019-10-03 19:47:49 -04:00 committed by GitHub
parent acf1fe5ee1 977ccda30f
commit a757e9dc47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -209,7 +209,11 @@ if (ENABLE_FFMPEG)
endif() endif()
endif() endif()
find_package(FFmpeg REQUIRED COMPONENTS avcodec avformat avutil swscale swresample) if (ENABLE_FFMPEG_VIDEO_DUMPER)
find_package(FFmpeg REQUIRED COMPONENTS avcodec avformat avutil swscale swresample)
else()
find_package(FFmpeg REQUIRED COMPONENTS avcodec)
endif()
if ("${FFmpeg_avcodec_VERSION}" VERSION_LESS "57.48.101") if ("${FFmpeg_avcodec_VERSION}" VERSION_LESS "57.48.101")
message(FATAL_ERROR "Found version for libavcodec is too low. The required version is at least 57.48.101 (included in FFmpeg 3.1 and later).") message(FATAL_ERROR "Found version for libavcodec is too low. The required version is at least 57.48.101 (included in FFmpeg 3.1 and later).")
endif() endif()