This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit ff0ad0278d6ff0e6f646be5ab910391316e891d5 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Thu May 7 13:54:57 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Fri May 8 09:35:38 2026 +0200 avcodec/cbs: Move ff_cbs_all_codec_ids to cbs_bsf Only used as AVBitStreamFilter.codec_ids. This avoids duplicating it into lavf. Reviewed-by: James Almer <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/bsf/filter_units.c | 1 + libavcodec/bsf/trace_headers.c | 1 + libavcodec/cbs.c | 34 ---------------------------------- libavcodec/cbs.h | 8 -------- libavcodec/cbs_bsf.c | 34 ++++++++++++++++++++++++++++++++++ libavcodec/cbs_bsf.h | 7 +++++++ 6 files changed, 43 insertions(+), 42 deletions(-) diff --git a/libavcodec/bsf/filter_units.c b/libavcodec/bsf/filter_units.c index 696a1f37c4..2514c66fd6 100644 --- a/libavcodec/bsf/filter_units.c +++ b/libavcodec/bsf/filter_units.c @@ -25,6 +25,7 @@ #include "bsf.h" #include "bsf_internal.h" #include "cbs.h" +#include "cbs_bsf.h" typedef struct FilterUnitsContext { diff --git a/libavcodec/bsf/trace_headers.c b/libavcodec/bsf/trace_headers.c index 8781f5f100..c026a426d9 100644 --- a/libavcodec/bsf/trace_headers.c +++ b/libavcodec/bsf/trace_headers.c @@ -25,6 +25,7 @@ #include "bsf.h" #include "bsf_internal.h" #include "cbs.h" +#include "cbs_bsf.h" typedef struct TraceHeadersContext { diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 7ff0f89aa5..aabddedeb2 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -63,40 +63,6 @@ static const CodedBitstreamType *const cbs_type_table[] = { #endif }; -const enum AVCodecID CBS_FUNC(all_codec_ids)[] = { -#if CBS_APV - AV_CODEC_ID_APV, -#endif -#if CBS_AV1 - AV_CODEC_ID_AV1, -#endif -#if CBS_H264 - AV_CODEC_ID_H264, -#endif -#if CBS_H265 - AV_CODEC_ID_H265, -#endif -#if CBS_H266 - AV_CODEC_ID_H266, -#endif -#if CBS_LCEVC - AV_CODEC_ID_LCEVC, -#endif -#if CBS_JPEG - AV_CODEC_ID_MJPEG, -#endif -#if CBS_MPEG2 - AV_CODEC_ID_MPEG2VIDEO, -#endif -#if CBS_VP8 - AV_CODEC_ID_VP8, -#endif -#if CBS_VP9 - AV_CODEC_ID_VP9, -#endif - AV_CODEC_ID_NONE -}; - av_cold int CBS_FUNC(init)(CodedBitstreamContext **ctx_ptr, enum AVCodecID codec_id, void *log_ctx) { diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 8c4614479f..b56dddd842 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -296,14 +296,6 @@ typedef struct CodedBitstreamContext { } CodedBitstreamContext; -/** - * Table of all supported codec IDs. - * - * Terminated by AV_CODEC_ID_NONE. - */ -extern const enum AVCodecID CBS_FUNC(all_codec_ids)[]; - - /** * Create and initialise a new context for the given codec. */ diff --git a/libavcodec/cbs_bsf.c b/libavcodec/cbs_bsf.c index f342e5489e..3a9dbad17c 100644 --- a/libavcodec/cbs_bsf.c +++ b/libavcodec/cbs_bsf.c @@ -22,6 +22,40 @@ #include "libavutil/attributes.h" +const enum AVCodecID ff_cbs_all_codec_ids[] = { +#if CONFIG_CBS_APV + AV_CODEC_ID_APV, +#endif +#if CONFIG_CBS_AV1 + AV_CODEC_ID_AV1, +#endif +#if CONFIG_CBS_H264 + AV_CODEC_ID_H264, +#endif +#if CONFIG_CBS_H265 + AV_CODEC_ID_H265, +#endif +#if CONFIG_CBS_H266 + AV_CODEC_ID_H266, +#endif +#if CONFIG_CBS_LCEVC + AV_CODEC_ID_LCEVC, +#endif +#if CONFIG_CBS_JPEG + AV_CODEC_ID_MJPEG, +#endif +#if CONFIG_CBS_MPEG2 + AV_CODEC_ID_MPEG2VIDEO, +#endif +#if CONFIG_CBS_VP8 + AV_CODEC_ID_VP8, +#endif +#if CONFIG_CBS_VP9 + AV_CODEC_ID_VP9, +#endif + AV_CODEC_ID_NONE +}; + static int cbs_bsf_update_side_data(AVBSFContext *bsf, AVPacket *pkt) { CBSBSFContext *ctx = bsf->priv_data; diff --git a/libavcodec/cbs_bsf.h b/libavcodec/cbs_bsf.h index 26bd448b87..f6f7ae05df 100644 --- a/libavcodec/cbs_bsf.h +++ b/libavcodec/cbs_bsf.h @@ -59,6 +59,13 @@ typedef struct CBSBSFContext { CodedBitstreamFragment fragment; } CBSBSFContext; +/** + * Table of all supported codec IDs. + * + * Terminated by AV_CODEC_ID_NONE. + */ +extern const enum AVCodecID ff_cbs_all_codec_ids[]; + /** * Initialise generic CBS BSF setup. * _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
