Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 01:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Updated FFmpeg from 5.0.1 to 5.1.2

Browse source
This commit is contained in:
Leon Styhre 2022-10-01 18:05:02 +02:00
parent 8f6262a3a9
commit 64a112747c
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -396,7 +396,7 @@ elseif(WIN32)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.80.0-win64-mingw/include ${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/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/FreeImage/Dist/x64
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include
${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src

34
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -122,26 +122,26 @@ copy /Y SDL2-2.24.0\lib\x64\SDL2main.lib ..
echo: echo:
echo Setting up FFmpeg echo Setting up FFmpeg
if exist 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.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0 rmdir /S /Q ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1
) )
:: This package should be available for download for two years. :: 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 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.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip 7z x ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\bin\avcodec-59.dll .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\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.1.2-1-g05d6157aab-win64-gpl-shared-5.1\bin\swscale-6.dll ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avcodec.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avcodec.lib ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avfilter.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avfilter.lib ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avformat.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avformat.lib ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\avutil.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\avutil.lib ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\swresample.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\swresample.lib ..
copy /Y ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0\lib\swscale.lib .. copy /Y ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1\lib\swscale.lib ..
echo: echo:
echo Setting up OpenSSL echo Setting up OpenSSL

18
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -72,15 +72,15 @@ echo -e "\nSetting up FFmpeg"
rm -rf ffmpeg-* rm -rf ffmpeg-*
# This package should be available for download for two years. # 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 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.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0.zip unzip ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1.zip
cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/avcodec-59.dll .. cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/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.1.2-1-g05d6157aab-win64-gpl-shared-5.1/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.1.2-1-g05d6157aab-win64-gpl-shared-5.1/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.1.2-1-g05d6157aab-win64-gpl-shared-5.1/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.1.2-1-g05d6157aab-win64-gpl-shared-5.1/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.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/swresample-4.dll ..
cp -p ffmpeg-n5.0.1-4-ga5ebb3d25e-win64-gpl-shared-5.0/bin/swscale-6.dll .. cp -p ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/bin/swscale-6.dll ..
echo -e "\nSetting up OpenSSL" echo -e "\nSetting up OpenSSL"