mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-01 00:49:12 +01:00
Merge pull request #5954 from lat9nq/ffmpeg-431-2
cmake: Update FFmpeg to 4.3.1
This commit is contained in:
commit
90f93a408a
3 changed files with 4 additions and 8 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -37,6 +37,6 @@
|
||||||
[submodule "opus"]
|
[submodule "opus"]
|
||||||
path = externals/opus/opus
|
path = externals/opus/opus
|
||||||
url = https://github.com/xiph/opus.git
|
url = https://github.com/xiph/opus.git
|
||||||
[submodule "externals/ffmpeg"]
|
[submodule "ffmpeg"]
|
||||||
path = externals/ffmpeg
|
path = externals/ffmpeg
|
||||||
url = https://git.ffmpeg.org/ffmpeg.git
|
url = https://git.ffmpeg.org/ffmpeg.git
|
||||||
|
|
|
@ -504,7 +504,7 @@ if (YUZU_USE_BUNDLED_FFMPEG)
|
||||||
endif()
|
endif()
|
||||||
else() # WIN32
|
else() # WIN32
|
||||||
# Use yuzu FFmpeg binaries
|
# Use yuzu FFmpeg binaries
|
||||||
set(FFmpeg_EXT_NAME "ffmpeg-4.2.1")
|
set(FFmpeg_EXT_NAME "ffmpeg-4.3.1")
|
||||||
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
|
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
|
||||||
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
|
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
|
||||||
set(FFmpeg_FOUND YES)
|
set(FFmpeg_FOUND YES)
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
function(copy_yuzu_FFmpeg_deps target_dir)
|
function(copy_yuzu_FFmpeg_deps target_dir)
|
||||||
include(WindowsCopyFiles)
|
include(WindowsCopyFiles)
|
||||||
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
||||||
windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST}
|
file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
|
||||||
avcodec-58.dll
|
windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
|
||||||
avutil-56.dll
|
|
||||||
swresample-3.dll
|
|
||||||
swscale-5.dll
|
|
||||||
)
|
|
||||||
endfunction(copy_yuzu_FFmpeg_deps)
|
endfunction(copy_yuzu_FFmpeg_deps)
|
||||||
|
|
Loading…
Reference in a new issue