From d6ebb5c1719c68002f8756de7e00c152c55948d8 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Mon, 8 Feb 2021 23:11:59 -0500 Subject: cmake: Revert FFmpeg 4.3.1 update for Windows builds The new 4.3.1 externals build seems to not be compatible with yuzu. This also fixes an oversight when renaming CMake variables. --- CMakeLists.txt | 2 +- CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 +- 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/$/") - 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 -- cgit v1.2.3