diff --git a/game/avcodec-60-06ae9beb669841440549f7a824ab8b6f.debug b/game/avcodec-61-5bc3395050ce68f25e7cd1fc7a80a3a6.debug similarity index 69% rename from game/avcodec-60-06ae9beb669841440549f7a824ab8b6f.debug rename to game/avcodec-61-5bc3395050ce68f25e7cd1fc7a80a3a6.debug index 2ada221ad..3ab0dcb45 100644 Binary files a/game/avcodec-60-06ae9beb669841440549f7a824ab8b6f.debug and b/game/avcodec-61-5bc3395050ce68f25e7cd1fc7a80a3a6.debug differ diff --git a/game/avcodec-60.dll b/game/avcodec-61.dll similarity index 65% rename from game/avcodec-60.dll rename to game/avcodec-61.dll index 5719a27c1..bfa045f17 100644 Binary files a/game/avcodec-60.dll and b/game/avcodec-61.dll differ diff --git a/game/avformat-60-fb40603230cec2d89dfe7669f22d45b8.debug b/game/avformat-60-fb40603230cec2d89dfe7669f22d45b8.debug deleted file mode 100644 index 1e2f0c7f3..000000000 Binary files a/game/avformat-60-fb40603230cec2d89dfe7669f22d45b8.debug and /dev/null differ diff --git a/game/avformat-60.dll b/game/avformat-60.dll deleted file mode 100644 index 34a0639fe..000000000 Binary files a/game/avformat-60.dll and /dev/null differ diff --git a/game/avformat-61-96a9581e52ab114223d9a9d39848e9ec.debug b/game/avformat-61-96a9581e52ab114223d9a9d39848e9ec.debug new file mode 100644 index 000000000..e22f7974d Binary files /dev/null and b/game/avformat-61-96a9581e52ab114223d9a9d39848e9ec.debug differ diff --git a/game/avformat-61.dll b/game/avformat-61.dll new file mode 100644 index 000000000..424c6002e Binary files /dev/null and b/game/avformat-61.dll differ diff --git a/game/avutil-58-4040e137548d624f478854564e65e8fc.debug b/game/avutil-58-4040e137548d624f478854564e65e8fc.debug deleted file mode 100644 index 7d519edbf..000000000 Binary files a/game/avutil-58-4040e137548d624f478854564e65e8fc.debug and /dev/null differ diff --git a/game/avutil-58.dll b/game/avutil-58.dll deleted file mode 100644 index 194888308..000000000 Binary files a/game/avutil-58.dll and /dev/null differ diff --git a/game/avutil-59-892b0c33201f111c96f99c56a180696f.debug b/game/avutil-59-892b0c33201f111c96f99c56a180696f.debug new file mode 100644 index 000000000..2de760702 Binary files /dev/null and b/game/avutil-59-892b0c33201f111c96f99c56a180696f.debug differ diff --git a/game/avutil-59.dll b/game/avutil-59.dll new file mode 100644 index 000000000..280018f5a Binary files /dev/null and b/game/avutil-59.dll differ diff --git a/game/swresample-4-a5694feae85fa72ef4837e0077af0215.debug b/game/swresample-4-a5694feae85fa72ef4837e0077af0215.debug deleted file mode 100644 index eea855d30..000000000 Binary files a/game/swresample-4-a5694feae85fa72ef4837e0077af0215.debug and /dev/null differ diff --git a/game/swresample-4.dll b/game/swresample-4.dll deleted file mode 100644 index 468bb0dcd..000000000 Binary files a/game/swresample-4.dll and /dev/null differ diff --git a/game/swresample-5-53817675edbe740810f5d3a14e57cfe7.debug b/game/swresample-5-53817675edbe740810f5d3a14e57cfe7.debug new file mode 100644 index 000000000..74102c70d Binary files /dev/null and b/game/swresample-5-53817675edbe740810f5d3a14e57cfe7.debug differ diff --git a/game/swresample-5.dll b/game/swresample-5.dll new file mode 100644 index 000000000..b44750d30 Binary files /dev/null and b/game/swresample-5.dll differ diff --git a/game/swscale-7-f2a0c3057c1ece2e5dee5bd0c81ee85c.debug b/game/swscale-7-f2a0c3057c1ece2e5dee5bd0c81ee85c.debug deleted file mode 100644 index 8cf519878..000000000 Binary files a/game/swscale-7-f2a0c3057c1ece2e5dee5bd0c81ee85c.debug and /dev/null differ diff --git a/game/swscale-8-82df3a12aa98a81387a7abd95c90f5c5.debug b/game/swscale-8-82df3a12aa98a81387a7abd95c90f5c5.debug new file mode 100644 index 000000000..c48791540 Binary files /dev/null and b/game/swscale-8-82df3a12aa98a81387a7abd95c90f5c5.debug differ diff --git a/game/swscale-7.dll b/game/swscale-8.dll similarity index 65% rename from game/swscale-7.dll rename to game/swscale-8.dll index 0890486b3..4a2e4d96e 100644 Binary files a/game/swscale-7.dll and b/game/swscale-8.dll differ diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 882c95fce..8de9d2ee6 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -89,6 +89,16 @@ IfFileExists $INSTDIR\libtiff-5.dll 0 +2 Delete "$INSTDIR\libtiff-5.dll" IfFileExists $INSTDIR\libwebp-4.dll 0 +2 Delete "$INSTDIR\libwebp-4.dll" +IfFileExists $INSTDIR\avcodec-60.dll 0 +2 +Delete "$INSTDIR\avcodec-60.dll" +IfFileExists $INSTDIR\avformat-60.dll 0 +2 +Delete "$INSTDIR\avformat-60.dll" +IfFileExists $INSTDIR\avutil-58.dll 0 +2 +Delete "$INSTDIR\avutil-58.dll" +IfFileExists $INSTDIR\swresample-4.dll 0 +2 +Delete "$INSTDIR\swresample-4.dll" +IfFileExists $INSTDIR\swscale-7.dll 0 +2 +Delete "$INSTDIR\swscale-7.dll" RMDir /r "$INSTDIR\Themes" RMDir /r "$INSTDIR\Skins" diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index e4deadb90..34c61ad7a 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -94,6 +94,11 @@ Delete "$INSTDIR\libtiff-6.dll" Delete "$INSTDIR\libwebp-7.dll" Delete "$INSTDIR\libdav1d.dll" + Delete "$INSTDIR\avcodec-61.dll" + Delete "$INSTDIR\avformat-61.dll" + Delete "$INSTDIR\avutil-59.dll" + Delete "$INSTDIR\swresample-5.dll" + Delete "$INSTDIR\swscale-8.dll" StrCpy $0 "$INSTDIR\songs" Call un.DeleteIfEmpty diff --git a/src/config-win.inc b/src/config-win.inc index 9460386b6..d7d2d28e5 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -15,49 +15,48 @@ {$IFEND} {$DEFINE HaveFFmpeg} -//the required DLLs can be downloaded here: https://ffmpeg.zeranoe.com/builds/win32/shared/ +//the required DLLs can be built with MXE {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF (0 > 0) or (6 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-6.0'} - {$DEFINE FF_API_OLD_DECODE_AUDIO} + {$IF (0 > 0) or (7 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-7.0'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} {$DEFINE useOLD_FFMPEG} {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} - FFMPEG_VERSION_INT = 6000000; - av__codec = 'avcodec-60'; - LIBAVCODEC_VERSION_MAJOR = 60; + FFMPEG_VERSION_INT = 7000000; + av__codec = 'avcodec-61'; + LIBAVCODEC_VERSION_MAJOR = 61; LIBAVCODEC_VERSION_MINOR = 3; LIBAVCODEC_VERSION_RELEASE = 100; - av__format = 'avformat-60'; - LIBAVFORMAT_VERSION_MAJOR = 60; - LIBAVFORMAT_VERSION_MINOR = 3; + av__format = 'avformat-61'; + LIBAVFORMAT_VERSION_MAJOR = 61; + LIBAVFORMAT_VERSION_MINOR = 1; LIBAVFORMAT_VERSION_RELEASE = 100; - av__util = 'avutil-58'; - LIBAVUTIL_VERSION_MAJOR = 58; - LIBAVUTIL_VERSION_MINOR = 2; + av__util = 'avutil-59'; + LIBAVUTIL_VERSION_MAJOR = 59; + LIBAVUTIL_VERSION_MINOR = 8; LIBAVUTIL_VERSION_RELEASE = 100; {$IFEND} {$IFEND} {$DEFINE HaveSWResample} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} - sw__resample = 'swresample-4'; - LIBSWRESAMPLE_VERSION_MAJOR = 4; - LIBSWRESAMPLE_VERSION_MINOR = 10; + sw__resample = 'swresample-5'; + LIBSWRESAMPLE_VERSION_MAJOR = 5; + LIBSWRESAMPLE_VERSION_MINOR = 1; LIBSWRESAMPLE_VERSION_RELEASE = 100; {$IFEND} {$DEFINE HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} - sw__scale = 'swscale-7'; - LIBSWSCALE_VERSION_MAJOR = 7; + sw__scale = 'swscale-8'; + LIBSWSCALE_VERSION_MAJOR = 8; LIBSWSCALE_VERSION_MINOR = 1; LIBSWSCALE_VERSION_RELEASE = 100; {$IFEND}