summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-02-09 05:14:19 +0100
committerGitHub <noreply@github.com>2021-02-09 05:14:19 +0100
commitb6736db32420927022ed52f7507ecd4f5a030ea0 (patch)
treec4cc15a15a62279799f9e4c1fc43b50fbf993359
parentMerge pull request #5880 from lat9nq/ffmpeg-external (diff)
parentcmake: Revert FFmpeg 4.3.1 update for Windows builds (diff)
downloadyuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.gz
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.bz2
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.lz
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.xz
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.zst
yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.zip
-rw-r--r--CMakeLists.txt2
-rw-r--r--CMakeModules/CopyYuzuFFmpegDeps.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac7c3ce90..c45123139 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -504,7 +504,7 @@ if (YUZU_USE_BUNDLED_FFMPEG)
endif()
else() # WIN32
# Use yuzu FFmpeg binaries
- set(FFmpeg_EXT_NAME "ffmpeg-4.3.1")
+ set(FFmpeg_EXT_NAME "ffmpeg-4.2.1")
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
set(FFmpeg_FOUND YES)
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake
index cca1eeeab..b7162cf17 100644
--- a/CMakeModules/CopyYuzuFFmpegDeps.cmake
+++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake
@@ -1,7 +1,7 @@
function(copy_yuzu_FFmpeg_deps target_dir)
include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
- windows_copy_files(${target_dir} ${FFMPEG_DLL_DIR} ${DLL_DEST}
+ windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST}
avcodec-58.dll
avutil-56.dll
swresample-3.dll