summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-05-28 13:17:58 -0400
committerGitHub <noreply@github.com>2023-05-28 13:17:58 -0400
commitbf3f4502114fb8f05531608b519d3c4e83a1e9a2 (patch)
tree0f380da3bc450bb5c78943c16955bd9f38dda365 /externals
parent09743fa6814746a24bec0c438ed2ed0c0a6dd2d1 (diff)
parent7701a00a0277ad59c1b743b9aa14c6861624b847 (diff)
Merge pull request #10283 from danilaml/support-interlaced-videos
Add support for deinterlaced video playback
Diffstat (limited to 'externals')
-rw-r--r--externals/ffmpeg/CMakeLists.txt5
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)
COMMAND
/bin/bash ${FFmpeg_PREFIX}/configure
--disable-avdevice
- --disable-avfilter
--disable-avformat
--disable-doc
--disable-everything
@@ -143,6 +142,7 @@ if (NOT WIN32)
--enable-decoder=h264
--enable-decoder=vp8
--enable-decoder=vp9
+ --enable-filter=yadif
--cc="${FFmpeg_CC}"
--cxx="${FFmpeg_CXX}"
${FFmpeg_HWACCEL_FLAGS}
@@ -199,7 +199,7 @@ if (NOT WIN32)
endif()
else(WIN32)
# Use yuzu FFmpeg binaries
- set(FFmpeg_EXT_NAME "ffmpeg-4.4")
+ set(FFmpeg_EXT_NAME "ffmpeg-5.1.3")
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
set(FFmpeg_FOUND YES)
@@ -210,6 +210,7 @@ else(WIN32)
set(FFmpeg_LIBRARIES
${FFmpeg_LIBRARY_DIR}/swscale.lib
${FFmpeg_LIBRARY_DIR}/avcodec.lib
+ ${FFmpeg_LIBRARY_DIR}/avfilter.lib
${FFmpeg_LIBRARY_DIR}/avutil.lib
CACHE PATH "Paths to FFmpeg libraries" FORCE)
# exported variables