Update to ffmpeg 7.1

UltraStar-Deluxe · Oct 13, 2024 · 2ab92a5 · 2ab92a5
1 parent 5468dbc
commit 2ab92a5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/configure.ac b/configure.ac
@@ -298,7 +298,7 @@ AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE)
 # map avutil library version to ffmpeg version
 AC_MSG_CHECKING([version of ffmpeg])
 # the order is ([avutil], [avcodec], [avformat], [swscale], [swresample])
-if   FFMPEG_LIBS_COMPATIBLE([59008100], [61003100], [61001100], [8001100], [5001100]); then
+if   FFMPEG_LIBS_COMPATIBLE([59039100], [61019100], [61007100], [8003100], [5003100]); then
     FFMPEG_VERSION="7.0"
 elif FFMPEG_LIBS_COMPATIBLE([58002100], [60003100], [60003100], [7001100], [4010100]); then
     FFMPEG_VERSION="6.0"
@@ -351,7 +351,7 @@ elif test $libavutil_VERSION_INT -le 50024000 -a $libavutil_VERSION_INT -ge 4900
 else
     AC_MSG_ERROR([
 
-Unsupported ffmpeg version, most recent version supported is 7.0.
+Unsupported ffmpeg version, most recent version supported is 7.1.
 ])
 fi
 AX_EXTRACT_VERSION(FFMPEG, $FFMPEG_VERSION)

diff --git a/src/lib/ffmpeg-7.0/avcodec.pas b/src/lib/ffmpeg-7.0/avcodec.pas
@@ -24,7 +24,7 @@ interface
 const
   (* Supported version by this header *)
   LIBAVCODEC_MAX_VERSION_MAJOR   = 61;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 3;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 19;
   LIBAVCODEC_MAX_VERSION_RELEASE = 100;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +

diff --git a/src/lib/ffmpeg-7.0/avformat.pas b/src/lib/ffmpeg-7.0/avformat.pas
@@ -25,7 +25,7 @@ interface
 const
   (* Max. supported version by this header *)
   LIBAVFORMAT_MAX_VERSION_MAJOR   = 61;
-  LIBAVFORMAT_MAX_VERSION_MINOR   = 1;
+  LIBAVFORMAT_MAX_VERSION_MINOR   = 7;
   LIBAVFORMAT_MAX_VERSION_RELEASE = 100;
   LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +

diff --git a/src/lib/ffmpeg-7.0/avutil.pas b/src/lib/ffmpeg-7.0/avutil.pas
@@ -28,7 +28,7 @@ interface
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 59;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 8;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 39;
   LIBAVUTIL_MAX_VERSION_RELEASE = 100;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +

diff --git a/src/lib/ffmpeg-7.0/swresample.pas b/src/lib/ffmpeg-7.0/swresample.pas
@@ -22,7 +22,7 @@ interface
 const
   (* Supported version by this header *)
   LIBSWRESAMPLE_MAX_VERSION_MAJOR   = 5;
-  LIBSWRESAMPLE_MAX_VERSION_MINOR   = 1;
+  LIBSWRESAMPLE_MAX_VERSION_MINOR   = 3;
   LIBSWRESAMPLE_MAX_VERSION_RELEASE = 100;
   LIBSWRESAMPLE_MAX_VERSION = (LIBSWRESAMPLE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBSWRESAMPLE_MAX_VERSION_MINOR * VERSION_MINOR) +

diff --git a/src/lib/ffmpeg-7.0/swscale.pas b/src/lib/ffmpeg-7.0/swscale.pas
@@ -22,7 +22,7 @@ interface
 const
   (* Max. supported version by this header *)
   LIBSWSCALE_MAX_VERSION_MAJOR   =  8;
-  LIBSWSCALE_MAX_VERSION_MINOR   =  1;
+  LIBSWSCALE_MAX_VERSION_MINOR   =  3;
   LIBSWSCALE_MAX_VERSION_RELEASE =  100;
   LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) +