Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ffmpeg 7.1 #914

Merged
merged 2 commits into from
Oct 14, 2024
+5 −5
Merged

Update to ffmpeg 7.1 #914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab92a5
Update to ffmpeg 7.1
DeinAlptraum Oct 13, 2024
1fbb847
Reset ffmpeg major version check
DeinAlptraum Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
DeinAlptraum marked this conversation as resolved.
Show resolved Hide resolved
FFMPEG_VERSION="7.0"
elif FFMPEG_LIBS_COMPATIBLE([58002100], [60003100], [60003100], [7001100], [4010100]); then
FFMPEG_VERSION="6.0"
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ffmpeg-7.0/avcodec.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ffmpeg-7.0/avformat.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ffmpeg-7.0/avutil.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ffmpeg-7.0/swresample.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ffmpeg-7.0/swscale.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
Loading