diff options
Diffstat (limited to '')
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index 4962f7bfd..93ba9b930 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -37,6 +37,6 @@ | |||
| 37 | [submodule "opus"] | 37 | [submodule "opus"] |
| 38 | path = externals/opus/opus | 38 | path = externals/opus/opus |
| 39 | url = https://github.com/xiph/opus.git | 39 | url = https://github.com/xiph/opus.git |
| 40 | [submodule "externals/ffmpeg"] | 40 | [submodule "ffmpeg"] |
| 41 | path = externals/ffmpeg | 41 | path = externals/ffmpeg |
| 42 | url = https://git.ffmpeg.org/ffmpeg.git | 42 | url = https://git.ffmpeg.org/ffmpeg.git |
diff --git a/CMakeLists.txt b/CMakeLists.txt index c45123139..ac7c3ce90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -504,7 +504,7 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 504 | endif() | 504 | endif() |
| 505 | else() # WIN32 | 505 | else() # WIN32 |
| 506 | # Use yuzu FFmpeg binaries | 506 | # Use yuzu FFmpeg binaries |
| 507 | set(FFmpeg_EXT_NAME "ffmpeg-4.2.1") | 507 | set(FFmpeg_EXT_NAME "ffmpeg-4.3.1") |
| 508 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 508 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 509 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 509 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 510 | set(FFmpeg_FOUND YES) | 510 | set(FFmpeg_FOUND YES) |
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index b7162cf17..26384e8b8 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | function(copy_yuzu_FFmpeg_deps target_dir) | 1 | function(copy_yuzu_FFmpeg_deps target_dir) |
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 4 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} | 4 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) |
| 5 | avcodec-58.dll | 5 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) |
| 6 | avutil-56.dll | ||
| 7 | swresample-3.dll | ||
| 8 | swscale-5.dll | ||
| 9 | ) | ||
| 10 | endfunction(copy_yuzu_FFmpeg_deps) | 6 | endfunction(copy_yuzu_FFmpeg_deps) |