From e4524270f4e21f40669e1bae9267508658a5ddf3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 25 Feb 2021 01:45:11 +0100 Subject: [PATCH] avcodec/avcodec: Add missing deprecation to AVCodecParser.next The whole old next API has been deprecated in commit 7e8eba2d8755962d9dca5eade57bf8f591a73c0c, yet deprecating the next pointer has been forgotten (the next pointers of other structures are below the public API delimiter, but such a delimiter doesn't exist for AVCodecParser). Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 3 +++ libavcodec/parsers.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ddca770cc4..3d77d2f6fd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3512,7 +3512,10 @@ typedef struct AVCodecParser { const uint8_t *buf, int buf_size); void (*parser_close)(AVCodecParserContext *s); int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size); +#if FF_API_NEXT + attribute_deprecated struct AVCodecParser *next; +#endif } AVCodecParser; /** diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index f8cfa1cde9..3d944f5222 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -79,6 +79,7 @@ extern AVCodecParser ff_xma_parser; #include "libavcodec/parser_list.c" #if FF_API_NEXT +FF_DISABLE_DEPRECATION_WARNINGS static AVOnce av_parser_next_init = AV_ONCE_INIT; static void av_parser_init_next(void) @@ -106,6 +107,7 @@ void av_register_codec_parser(AVCodecParser *parser) { ff_thread_once(&av_parser_next_init, av_parser_init_next); } +FF_ENABLE_DEPRECATION_WARNINGS #endif const AVCodecParser *av_parser_iterate(void **opaque)