aboutsummaryrefslogtreecommitdiffhomepage
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorDanila Malyutin <[email protected]>2023-07-18 03:01:49 +0400
committerDanila Malyutin <[email protected]>2023-08-28 00:48:53 +0400
commit164f880f2385c8c7e3498286eebb9ef4782674c3 (patch)
tree7c43786b3b2716f780d5717b64734797f4261c87 /externals/ffmpeg
parentada4697300fce6a139bd78d548f151f9f4599ad3 (diff)
downloadyuzu-android-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.gz
yuzu-android-164f880f2385c8c7e3498286eebb9ef4782674c3.zip
Use initial_frame to check interlaced flag
If final frame was transferred from GPU, it won't carry the props. Fixes #11089
Diffstat (limited to 'externals/ffmpeg')
-rw-r--r--externals/ffmpeg/CMakeLists.txt4
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)