Update FFmpeg DLLs to 7.0.1

UltraStar-Deluxe · Jul 28, 2024 · dfc1489 · dfc1489
1 parent e3c1b81
commit dfc1489
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 18 deletions.
diff --git a/...60-06ae9beb669841440549f7a824ab8b6f.debug → ...61-5bc3395050ce68f25e7cd1fc7a80a3a6.debug b/...60-06ae9beb669841440549f7a824ab8b6f.debug → ...61-5bc3395050ce68f25e7cd1fc7a80a3a6.debug
diff --git a/game/avcodec-60.dll → game/avcodec-61.dll b/game/avcodec-60.dll → game/avcodec-61.dll
diff --git a/game/avformat-60-fb40603230cec2d89dfe7669f22d45b8.debug b/game/avformat-60-fb40603230cec2d89dfe7669f22d45b8.debug
diff --git a/game/avformat-60.dll b/game/avformat-60.dll
diff --git a/game/avformat-61-96a9581e52ab114223d9a9d39848e9ec.debug b/game/avformat-61-96a9581e52ab114223d9a9d39848e9ec.debug
diff --git a/game/avformat-61.dll b/game/avformat-61.dll
diff --git a/game/avutil-58-4040e137548d624f478854564e65e8fc.debug b/game/avutil-58-4040e137548d624f478854564e65e8fc.debug
diff --git a/game/avutil-58.dll b/game/avutil-58.dll
diff --git a/game/avutil-59-892b0c33201f111c96f99c56a180696f.debug b/game/avutil-59-892b0c33201f111c96f99c56a180696f.debug
diff --git a/game/avutil-59.dll b/game/avutil-59.dll
diff --git a/game/swresample-4-a5694feae85fa72ef4837e0077af0215.debug b/game/swresample-4-a5694feae85fa72ef4837e0077af0215.debug
diff --git a/game/swresample-4.dll b/game/swresample-4.dll
diff --git a/game/swresample-5-53817675edbe740810f5d3a14e57cfe7.debug b/game/swresample-5-53817675edbe740810f5d3a14e57cfe7.debug
diff --git a/game/swresample-5.dll b/game/swresample-5.dll
diff --git a/game/swscale-7-f2a0c3057c1ece2e5dee5bd0c81ee85c.debug b/game/swscale-7-f2a0c3057c1ece2e5dee5bd0c81ee85c.debug
diff --git a/game/swscale-8-82df3a12aa98a81387a7abd95c90f5c5.debug b/game/swscale-8-82df3a12aa98a81387a7abd95c90f5c5.debug
diff --git a/game/swscale-7.dll → game/swscale-8.dll b/game/swscale-7.dll → game/swscale-8.dll
diff --git 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
@@ -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
@@ -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}