This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit e7858bb3bb6df0220ec6b70480c4fd63a4c3c74e Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sun Mar 8 20:48:00 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 17:15:02 2026 +0200 avcodec: Remove FF_API_PARSER_CODECID The parser API was scheduled to use enum AVCodecID in commit 8a322c956f3808a7199aef9b63a187af17c0a372 on 2025-11-01. The switch is made now despite this being fairly recently because it involves no deprecation and therefore no change from our downstreams at all. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/avcodec.h | 8 -------- libavcodec/parser.c | 4 ---- libavcodec/parser_internal.h | 4 ---- libavcodec/version_major.h | 1 - 4 files changed, 17 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 11ee76efd9..5f7ee31f0d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2761,11 +2761,7 @@ typedef struct AVCodecParserContext { } AVCodecParserContext; typedef struct AVCodecParser { -#if FF_API_PARSER_CODECID - int codec_ids[7]; /* several codec IDs are permitted */ -#else enum AVCodecID codec_ids[7]; /* several codec IDs are permitted */ -#endif #if FF_API_PARSER_PRIVATE /***************************************************************** * All fields below this line are not part of the public API. They @@ -2803,11 +2799,7 @@ typedef struct AVCodecParser { */ const AVCodecParser *av_parser_iterate(void **opaque); -#if FF_API_PARSER_CODECID -AVCodecParserContext *av_parser_init(int codec_id); -#else AVCodecParserContext *av_parser_init(enum AVCodecID codec_id); -#endif /** * Parse a packet. diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 28f4de5826..cf5d65ee16 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -32,11 +32,7 @@ #include "parser.h" #include "parser_internal.h" -#if FF_API_PARSER_CODECID -av_cold AVCodecParserContext *av_parser_init(int codec_id) -#else av_cold AVCodecParserContext *av_parser_init(enum AVCodecID codec_id) -#endif { AVCodecParserContext *s = NULL; const AVCodecParser *parser; diff --git a/libavcodec/parser_internal.h b/libavcodec/parser_internal.h index fa9af971c1..aad1fe1146 100644 --- a/libavcodec/parser_internal.h +++ b/libavcodec/parser_internal.h @@ -28,11 +28,7 @@ #if FF_API_PARSER_PRIVATE typedef union FFCodecParser { struct { -#if FF_API_PARSER_CODECID - int codec_ids[7]; /* several codec IDs are permitted */ -#else enum AVCodecID codec_ids[7]; /* several codec IDs are permitted */ -#endif int priv_data_size; int (*init)(AVCodecParserContext *s); int (*parse)(AVCodecParserContext *s, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index df3f3236d8..5537db72d3 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -47,7 +47,6 @@ #define FF_API_NVDEC_OLD_PIX_FMTS (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_PARSER_PRIVATE (LIBAVCODEC_VERSION_MAJOR < 63) -#define FF_API_PARSER_CODECID (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_MJPEG_EXTERN_HUFF (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_NVENC_H264_MAIN (LIBAVCODEC_VERSION_MAJOR < 63) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
