diff options
| author |  Danila Malyutin | 2023-07-18 03:01:49 +0400 |
|---|---|---|
| committer |  Danila Malyutin | 2023-08-28 00:48:53 +0400 |
| commit | 164f880f2385c8c7e3498286eebb9ef4782674c3 (patch) | |
| tree | 7c43786b3b2716f780d5717b64734797f4261c87 /externals/ffmpeg | |
| parent | Merge pull request #11389 from FernandoS27/discard-fix (diff) | |
| download | yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.gz yuzu-164f880f2385c8c7e3498286eebb9ef4782674c3.tar.xz yuzu-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.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) | |||
| 164 | --enable-decoder=h264 | 164 | --enable-decoder=h264 |
| 165 | --enable-decoder=vp8 | 165 | --enable-decoder=vp8 |
| 166 | --enable-decoder=vp9 | 166 | --enable-decoder=vp9 |
| 167 | --enable-filter=yadif | 167 | --enable-filter=yadif,scale |
| 168 | --cc="${FFmpeg_CC}" | 168 | --cc="${FFmpeg_CC}" |
| 169 | --cxx="${FFmpeg_CXX}" | 169 | --cxx="${FFmpeg_CXX}" |
| 170 | ${FFmpeg_HWACCEL_FLAGS} | 170 | ${FFmpeg_HWACCEL_FLAGS} |
| @@ -254,7 +254,7 @@ elseif(ANDROID) | |||
| 254 | set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) | 254 | set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) |
| 255 | elseif(WIN32) | 255 | elseif(WIN32) |
| 256 | # Use yuzu FFmpeg binaries | 256 | # Use yuzu FFmpeg binaries |
| 257 | set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") | 257 | set(FFmpeg_EXT_NAME "ffmpeg-6.0") |
| 258 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 258 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 259 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 259 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 260 | set(FFmpeg_FOUND YES) | 260 | set(FFmpeg_FOUND YES) |