diff options
Diffstat (limited to 'externals/ffmpeg/CMakeLists.txt')
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 0baac8e17..03fad0778 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt | |||
| @@ -131,7 +131,6 @@ if (NOT WIN32) | |||
| 131 | COMMAND | 131 | COMMAND |
| 132 | /bin/bash ${FFmpeg_PREFIX}/configure | 132 | /bin/bash ${FFmpeg_PREFIX}/configure |
| 133 | --disable-avdevice | 133 | --disable-avdevice |
| 134 | --disable-avfilter | ||
| 135 | --disable-avformat | 134 | --disable-avformat |
| 136 | --disable-doc | 135 | --disable-doc |
| 137 | --disable-everything | 136 | --disable-everything |
| @@ -143,6 +142,7 @@ if (NOT WIN32) | |||
| 143 | --enable-decoder=h264 | 142 | --enable-decoder=h264 |
| 144 | --enable-decoder=vp8 | 143 | --enable-decoder=vp8 |
| 145 | --enable-decoder=vp9 | 144 | --enable-decoder=vp9 |
| 145 | --enable-filter=yadif | ||
| 146 | --cc="${FFmpeg_CC}" | 146 | --cc="${FFmpeg_CC}" |
| 147 | --cxx="${FFmpeg_CXX}" | 147 | --cxx="${FFmpeg_CXX}" |
| 148 | ${FFmpeg_HWACCEL_FLAGS} | 148 | ${FFmpeg_HWACCEL_FLAGS} |
| @@ -199,7 +199,7 @@ if (NOT WIN32) | |||
| 199 | endif() | 199 | endif() |
| 200 | else(WIN32) | 200 | else(WIN32) |
| 201 | # Use yuzu FFmpeg binaries | 201 | # Use yuzu FFmpeg binaries |
| 202 | set(FFmpeg_EXT_NAME "ffmpeg-4.4") | 202 | set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") |
| 203 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 203 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 204 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 204 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 205 | set(FFmpeg_FOUND YES) | 205 | set(FFmpeg_FOUND YES) |
| @@ -210,6 +210,7 @@ else(WIN32) | |||
| 210 | set(FFmpeg_LIBRARIES | 210 | set(FFmpeg_LIBRARIES |
| 211 | ${FFmpeg_LIBRARY_DIR}/swscale.lib | 211 | ${FFmpeg_LIBRARY_DIR}/swscale.lib |
| 212 | ${FFmpeg_LIBRARY_DIR}/avcodec.lib | 212 | ${FFmpeg_LIBRARY_DIR}/avcodec.lib |
| 213 | ${FFmpeg_LIBRARY_DIR}/avfilter.lib | ||
| 213 | ${FFmpeg_LIBRARY_DIR}/avutil.lib | 214 | ${FFmpeg_LIBRARY_DIR}/avutil.lib |
| 214 | CACHE PATH "Paths to FFmpeg libraries" FORCE) | 215 | CACHE PATH "Paths to FFmpeg libraries" FORCE) |
| 215 | # exported variables | 216 | # exported variables |