Browse Source
Merge pull request #5899 from ameerj/ffmpeg-revert
cmake: Revert FFmpeg 4.3.1 update for Windows builds
pull/15/merge
Morph
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
CMakeLists.txt
-
CMakeModules/CopyYuzuFFmpegDeps.cmake
|
|
|
@ -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,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 |
|
|
|
|
