diff mbox series

[FFmpeg-devel,v3,5/5] avcodec/mmaldec: Deduplicate AVClasses

Message ID AM7PR03MB6660E41B836AC308C1B3849D8F709@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 7fe5c7f02dbcda8494150ca79922e4994399274b
Headers show
Series Switch mmaldec to receive_frame API | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Dec. 9, 2021, 1:08 p.m. UTC 
Possible now that the child_class_next API is gone.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mmaldec.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 0c7df0a0bc..f8a7319cd6 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -820,16 +820,14 @@  static const AVOption options[]={
     {NULL}
 };
 
-#define FFMMAL_DEC_CLASS(NAME) \
-    static const AVClass ffmmal_##NAME##_dec_class = { \
-        .class_name = "mmal_" #NAME "_dec", \
-        .item_name  = av_default_item_name, \
-        .option     = options, \
-        .version    = LIBAVUTIL_VERSION_INT, \
-    };
+static const AVClass ffmmal_dec_class = {
+    .class_name = "mmal_dec",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
 
 #define FFMMAL_DEC(NAME, ID) \
-    FFMMAL_DEC_CLASS(NAME) \
     const AVCodec ff_##NAME##_mmal_decoder = { \
         .name           = #NAME "_mmal", \
         .long_name      = NULL_IF_CONFIG_SMALL(#NAME " (mmal)"), \
@@ -840,7 +838,7 @@  static const AVOption options[]={
         .close          = ffmmal_close_decoder, \
         .receive_frame  = ffmmal_receive_frame, \
         .flush          = ffmmal_flush, \
-        .priv_class     = &ffmmal_##NAME##_dec_class, \
+        .priv_class     = &ffmmal_dec_class, \
         .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, \
         .caps_internal  = FF_CODEC_CAP_SETS_PKT_DTS, \
         .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_MMAL, \