diff mbox series

[FFmpeg-devel,v2,4/4] avcodec/avcodec: Add missing deprecation to AVCodecParser.next

Message ID 20210225162722.1368854-1-andreas.rheinhardt@gmail.com
State Accepted
Headers show
Series Untitled series #3408
Related show

Commit Message

Andreas Rheinhardt Feb. 25, 2021, 4:27 p.m. UTC
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).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
Thanks for the hint. I don't know how I could have overlooked that.

 libavcodec/avcodec.h | 3 +++
 libavcodec/parsers.c | 2 ++
 2 files changed, 5 insertions(+)

Comments

James Almer Feb. 25, 2021, 4:37 p.m. UTC | #1
On 2/25/2021 1:27 PM, Andreas Rheinhardt wrote:
> 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).
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
> Thanks for the hint. I don't know how I could have overlooked that.
> 
>   libavcodec/avcodec.h | 3 +++
>   libavcodec/parsers.c | 2 ++
>   2 files changed, 5 insertions(+)
> 
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 5df6a8aedc..b0cb91f555 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

Add the missing four spaces indentation.

LGTM with that change.

>       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)
>
diff mbox series

Patch

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5df6a8aedc..b0cb91f555 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)