diff options
| author | Danila Malyutin <d.maljutin@yandex.ru> | 2023-07-18 01:01:49 +0200 |
|---|---|---|
| committer | Danila Malyutin <danilaml@users.noreply.github.com> | 2023-08-27 22:48:53 +0200 |
| commit | 164f880f2385c8c7e3498286eebb9ef4782674c3 (patch) | |
| tree | 7c43786b3b2716f780d5717b64734797f4261c87 /externals/ffmpeg | |
| parent | Merge pull request #11389 from FernandoS27/discard-fix (diff) | |
| download | yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.gz yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.bz2 yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.lz yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.xz yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.zst yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.zip | |
Diffstat (limited to 'externals/ffmpeg')
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 0a926e399..f2886eb6c 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -164,7 +164,7 @@ if (NOT WIN32 AND NOT ANDROID) --enable-decoder=h264 --enable-decoder=vp8 --enable-decoder=vp9 - --enable-filter=yadif + --enable-filter=yadif,scale --cc="${FFmpeg_CC}" --cxx="${FFmpeg_CXX}" ${FFmpeg_HWACCEL_FLAGS} @@ -254,7 +254,7 @@ elseif(ANDROID) set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) elseif(WIN32) # Use yuzu FFmpeg binaries - set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") + set(FFmpeg_EXT_NAME "ffmpeg-6.0") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") set(FFmpeg_FOUND YES) |