diff options
| author |  Morph | 2021-02-09 12:14:19 +0800 |
|---|---|---|
| committer |  GitHub | 2021-02-09 12:14:19 +0800 |
| commit | b6736db32420927022ed52f7507ecd4f5a030ea0 (patch) | |
| tree | c4cc15a15a62279799f9e4c1fc43b50fbf993359 /CMakeModules | |
| parent | Merge pull request #5880 from lat9nq/ffmpeg-external (diff) | |
| parent | cmake: Revert FFmpeg 4.3.1 update for Windows builds (diff) | |
| download | yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.gz yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.tar.xz yuzu-b6736db32420927022ed52f7507ecd4f5a030ea0.zip | |
Merge pull request #5899 from ameerj/ffmpeg-revert
cmake: Revert FFmpeg 4.3.1 update for Windows builds
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
| 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 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} |
| 5 | avcodec-58.dll | 5 | avcodec-58.dll |
| 6 | avutil-56.dll | 6 | avutil-56.dll |
| 7 | swresample-3.dll | 7 | swresample-3.dll |