소스 검색

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.
ameerj 5 년 전
부모
커밋
d6ebb5c171
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      CMakeLists.txt
  2. 1 1
      CMakeModules/CopyYuzuFFmpegDeps.cmake

+ 1 - 1
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)

+ 1 - 1
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