diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-08-29 09:27:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 09:27:22 -0400 |
| commit | d360abadba9b8d3c1748f1e55ea3421cd1be4a53 (patch) | |
| tree | 5901b223c88ae9d9fe92672a4dbf6188968f84ed /externals | |
| parent | 2f18fa5cd1258b38110dbe05fb26aaefc5b45e3b (diff) | |
| parent | 164f880f2385c8c7e3498286eebb9ef4782674c3 (diff) | |
Merge pull request #11112 from danilaml/nvdec-deinterlace
Use initial_frame to check interlaced flag
Diffstat (limited to 'externals')
| -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) |