[vlc-commits] [Git][videolan/vlc][master] 4 commits: configure: raise the minimum FFmpeg version to 4.4
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Wed Sep 10 20:04:15 UTC 2025
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
48675ba3 by Steve Lhomme at 2025-09-10T19:45:10+00:00
configure: raise the minimum FFmpeg version to 4.4
Ubuntu Focal (20.04) is no longer listed in the package search page [^1].
It will never get VLC 4. The oldest currently maintained version if Ubuntu
Jammy (22.04). It contains ffmpeg 4.4 [^2].
[^1]: https://packages.ubuntu.com/search?keywords=ffmpeg
[^2]: https://packages.ubuntu.com/jammy/ffmpeg
- - - - -
1225fb47 by Steve Lhomme at 2025-09-10T19:45:10+00:00
configure: mention the latest stable Debian is trixie with FFmpeg 7.1
- - - - -
ac3e8fd7 by Steve Lhomme at 2025-09-10T19:45:10+00:00
directxva: remove check on older libavcodec version
We require FFmpeg 4.4 which has libavcodec 58.134.100.
- - - - -
96d8085b by Steve Lhomme at 2025-09-10T19:45:10+00:00
fourcc: remove check on older libavcodec version
We require FFmpeg 4.4 which has libavcodec 58.134.100.
- - - - -
4 changed files:
- configure.ac
- modules/codec/avcodec/directx_va.c
- modules/codec/avcodec/fourcc.c
- modules/meson.build
Changes:
=====================================
configure.ac
=====================================
@@ -2675,9 +2675,9 @@ AS_HELP_STRING([--enable-merge-ffmpeg], [merge FFmpeg-based plugins (default dis
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
-dnl We require ffmpeg >= 4.2
-dnl Ubuntu Focal (20.04 LTS) has 4.2, debian stable (bookworm) has 5.1
-PKG_HAVE_WITH_MODULES([AVCODEC], [libavcodec >= 58.54.100 libavutil >= 56.31.100],
+dnl We require ffmpeg >= 4.4
+dnl Ubuntu Jammy (22.04 LTS) has 4.4, debian stable (trixie) has 7.1
+PKG_HAVE_WITH_MODULES([AVCODEC], [libavcodec >= 58.134.100 libavutil >= 56.70.100],
[libavcodec codec (default enabled)], [yes])
dnl
@@ -2824,7 +2824,7 @@ AS_HELP_STRING([--enable-avformat], [libavformat containers (default enabled)]),
])
have_avformat="no"
AS_IF([test "${enable_avformat}" != "no"], [
- PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 58.29.100 libavcodec libavutil], [
+ PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 58.76.100 libavcodec libavutil], [
have_avformat="yes"
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
=====================================
modules/codec/avcodec/directx_va.c
=====================================
@@ -72,15 +72,8 @@ static const int PROF_HEVC_MAIN_REXT[] = { FF_PROFILE_HEVC_REXT,
static const int PROF_VP9_MAIN[] = { FF_PROFILE_VP9_0, FF_PROFILE_UNKNOWN };
static const int PROF_VP9_10[] = { FF_PROFILE_VP9_2, FF_PROFILE_UNKNOWN };
-#if LIBAVCODEC_VERSION_CHECK( 58, 112, 103 )
-#define ENABLED_AV1_CODECID AV_CODEC_ID_AV1
static const int PROF_AV1_MAIN[] = { FF_PROFILE_AV1_MAIN, FF_PROFILE_UNKNOWN };
static const int PROF_AV1_HIGH[] = { FF_PROFILE_AV1_HIGH, FF_PROFILE_AV1_MAIN, FF_PROFILE_UNKNOWN };
-#else
-#define ENABLED_AV1_CODECID 0
-#define PROF_AV1_MAIN NULL
-#define PROF_AV1_HIGH NULL
-#endif
#if defined(__MINGW64_VERSION_MAJOR) // mingw-w64 doesn't have all the standard GUIDs
@@ -325,10 +318,10 @@ static const directx_va_mode_t DXVA_MODES[] = {
DEF_DXVA_MODE_420_8B_UNSUPPORTED( "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel ),
/* AV1 */
- DEF_DXVA_MODE_420_8B( "AV1 Main profile 8", &DXVA_ModeAV1_VLD_Profile0, ENABLED_AV1_CODECID, PROF_AV1_MAIN ),
- DEF_DXVA_MODE_420_10B( "AV1 Main profile 10", &DXVA_ModeAV1_VLD_Profile0, ENABLED_AV1_CODECID, PROF_AV1_MAIN ),
- DEF_DXVA_MODE_420_8B( "AV1 High profile 8", &DXVA_ModeAV1_VLD_Profile1, ENABLED_AV1_CODECID, PROF_AV1_HIGH ),
- DEF_DXVA_MODE_420_10B( "AV1 High profile 10", &DXVA_ModeAV1_VLD_Profile1, ENABLED_AV1_CODECID, PROF_AV1_HIGH ),
+ DEF_DXVA_MODE_420_8B( "AV1 Main profile 8", &DXVA_ModeAV1_VLD_Profile0, AV_CODEC_ID_AV1, PROF_AV1_MAIN ),
+ DEF_DXVA_MODE_420_10B( "AV1 Main profile 10", &DXVA_ModeAV1_VLD_Profile0, AV_CODEC_ID_AV1, PROF_AV1_MAIN ),
+ DEF_DXVA_MODE_420_8B( "AV1 High profile 8", &DXVA_ModeAV1_VLD_Profile1, AV_CODEC_ID_AV1, PROF_AV1_HIGH ),
+ DEF_DXVA_MODE_420_10B( "AV1 High profile 10", &DXVA_ModeAV1_VLD_Profile1, AV_CODEC_ID_AV1, PROF_AV1_HIGH ),
};
static const directx_va_mode_t *FindVideoServiceConversion(vlc_va_t *, const directx_sys_t *, const es_format_t *, video_format_t *fmt_out,
=====================================
modules/codec/avcodec/fourcc.c
=====================================
@@ -161,9 +161,7 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
{ VLC_CODEC_FLASHSV, AV_CODEC_ID_FLASHSV },
{ VLC_CODEC_CAVS, AV_CODEC_ID_CAVS },
{ VLC_CODEC_CAVS2, AV_CODEC_ID_AVS2 },
-#if LIBAVCODEC_VERSION_CHECK(58, 109, 100)
{ VLC_CODEC_CAVS3, AV_CODEC_ID_AVS3 },
-#endif
{ VLC_CODEC_JPEG2000, AV_CODEC_ID_JPEG2000 },
{ VLC_CODEC_VMNC, AV_CODEC_ID_VMNC },
{ VLC_CODEC_VP5, AV_CODEC_ID_VP5 },
@@ -324,13 +322,9 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
{ VLC_CODEC_AGM, AV_CODEC_ID_AGM },
-#if LIBAVCODEC_VERSION_CHECK( 58, 56, 100 )
{ VLC_CODEC_IMM5, AV_CODEC_ID_IMM5 },
-#endif
-#if LIBAVCODEC_VERSION_CHECK( 58, 85, 100 )
{ VLC_CODEC_NOTCHLC, AV_CODEC_ID_NOTCHLC },
-#endif
};
=====================================
modules/meson.build
=====================================
@@ -195,9 +195,9 @@ librist_dep = dependency('librist', required: get_option('rist'))
mtp_dep = dependency('libmtp', version: '>=1.0.0', required: get_option('mtp'))
# FFmpeg
-avformat_dep = dependency('libavformat', version: '>= 58.29.100', required: get_option('avformat'))
-avcodec_dep = dependency('libavcodec', version: '>= 58.54.100', required: get_option('avcodec'))
-avutil_dep = dependency('libavutil', version: '>= 56.31.100', required: false)
+avformat_dep = dependency('libavformat', version: '>= 58.76.100', required: get_option('avformat'))
+avcodec_dep = dependency('libavcodec', version: '>= 58.134.100', required: get_option('avcodec'))
+avutil_dep = dependency('libavutil', version: '>= 56.70.100', required: false)
# Freetype, used by text_renderer and ASS access
freetype_dep = dependency('freetype2', 'freetype', required: get_option('freetype'))
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d26c0f56a254610d7991a5e83f853ef452dd8e9b...96d8085b8159d953466394a11313e9e2d439871a
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d26c0f56a254610d7991a5e83f853ef452dd8e9b...96d8085b8159d953466394a11313e9e2d439871a
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list