From 64a112747c65aa9c0c6a75153ec3e6d89abe3dea Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 1 Oct 2022 18:05:02 +0200 Subject: [PATCH] (Windows) Updated FFmpeg from 5.0.1 to 5.1.2 --- CMakeLists.txt | 2 +- tools/Windows_dependencies_setup_MSVC.bat | 34 +++++++++++------------ tools/Windows_dependencies_setup_MinGW.sh | 18 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f41fd6746..104e0b20e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -396,7 +396,7 @@ elseif(WIN32) set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.80.0-win64-mingw/include ${CMAKE_CURRENT_SOURCE_DIR}/external/glew-2.1.0/include - ${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/include + ${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/include ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64 ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index b2078b4ec..826ce25a1 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -122,26 +122,26 @@ copy /Y SDL2-2.24.0\lib\x64\SDL2main.lib .. echo: echo Setting up FFmpeg -if exist ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\ ( - rmdir /S /Q ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0 +if exist ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\ ( + rmdir /S /Q ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1 ) :: This package should be available for download for two years. -curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-04-30-14-59/ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip -7z x ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\avcodec-59.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\avfilter-8.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\avformat-59.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\avutil-57.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\postproc-56.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\swresample-4.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\swscale-6.dll .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avcodec.lib .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avfilter.lib .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avformat.lib .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avutil.lib .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\swresample.lib .. -copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\swscale.lib .. +curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-09-30-12-41/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +7z x ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\avcodec-59.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\avfilter-8.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\avformat-59.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\avutil-57.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\postproc-56.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\swresample-4.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\swscale-6.dll .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avcodec.lib .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avfilter.lib .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avformat.lib .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avutil.lib .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\swresample.lib .. +copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\swscale.lib .. echo: echo Setting up OpenSSL diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index af93a415c..c4ee6139c 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -72,15 +72,15 @@ echo -e "\nSetting up FFmpeg" rm -rf ffmpeg-* # This package should be available for download for two years. -curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-04-30-14-59/ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip -unzip ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/avcodec-59.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/avfilter-8.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/avformat-59.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/avutil-57.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/postproc-56.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/swresample-4.dll .. -cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/swscale-6.dll .. +curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-09-30-12-41/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +unzip ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/avcodec-59.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/avfilter-8.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/avformat-59.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/avutil-57.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/postproc-56.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/swresample-4.dll .. +cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/swscale-6.dll .. echo -e "\nSetting up OpenSSL"