This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 6a59c847b50c6bc30630df7fca56ccd6cd8a5a8c Author: Andreas Rheinhardt <[email protected]> AuthorDate: Thu May 7 13:25:29 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Fri May 8 09:34:52 2026 +0200 configure: Redo enabling cbs in lavf Right now, the cbs_type_table (the table of all CodedBitstreamTypes supported by CBS) is empty unless cbs_apv and cbs_av1 is enabled. The latter are only enabled in configure if they are needed in lavc. This means that the mov muxers (the only users of cbs-in-lavf) don't work as they should depending upon the availability of e.g. the av1_metadata BSF. The table being empty is also illegal C and according to PR #23038 MSVC warns about this (as does GCC with -pedantic) and it may even lead to an internal compiler error. This could be fixed by simply adding a mov_muxer->cbs_av1,cbs_apv dependency in configure, yet this would have the downside that it would force cbs_av1 and cbs_apv to be built for lavc, too, even though it may not be needed there. So add new configure variables cbs_{apv,av1}_lavf and cbs_lavf to track this correctly. Reported-by: xiaozhuai <[email protected]> Reviewed-by: James Almer <[email protected]> Reviewed-by: xiaozhuai <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> --- configure | 4 +++- libavformat/Makefile | 4 +++- libavformat/cbs.h | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9bce658932..18be80a243 100755 --- a/configure +++ b/configure @@ -2746,7 +2746,9 @@ CONFIG_EXTRA=" cabac cbs cbs_apv + cbs_apv_lavf cbs_av1 + cbs_av1_lavf cbs_h264 cbs_h265 cbs_h266 @@ -3963,7 +3965,7 @@ mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" mov_demuxer_suggest="iamfdec zlib" -mov_muxer_select="iso_media iso_writer riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" +mov_muxer_select="cbs_apv_lavf cbs_av1_lavf iso_media iso_writer riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" mov_muxer_suggest="iamfenc" mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" diff --git a/libavformat/Makefile b/libavformat/Makefile index c020e77c15..ac56e54aa8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -40,6 +40,8 @@ OBJS = allformats.o \ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o # subsystems +OBJS-$(CONFIG_CBS_APV_LAVF) += cbs_apv.o cbs.o +OBJS-$(CONFIG_CBS_AV1_LAVF) += cbs_av1.o cbs.o OBJS-$(CONFIG_ISO_MEDIA) += isom.o OBJS-$(CONFIG_ISO_WRITER) += avc.o hevc.o vvc.o OBJS-$(CONFIG_IAMFDEC) += iamf_reader.o iamf_parse.o iamf.o @@ -390,7 +392,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o \ - apv.o dovi_isom.o evc.o cbs.o cbs_av1.o cbs_apv.o + apv.o dovi_isom.o evc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/cbs.h b/libavformat/cbs.h index dffd0e9206..e4c0f33f6a 100644 --- a/libavformat/cbs.h +++ b/libavformat/cbs.h @@ -19,9 +19,13 @@ #ifndef AVFORMAT_CBS_H #define AVFORMAT_CBS_H +#include "config.h" + #define CBS_PREFIX lavf_cbs #define CBS_WRITE 0 #define CBS_TRACE 0 +#define CBS_APV CONFIG_CBS_APV_LAVF +#define CBS_AV1 CONFIG_CBS_AV1_LAVF #define CBS_H264 0 #define CBS_H265 0 #define CBS_H266 0 _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
