diff mbox series

[FFmpeg-devel,38/41] avcodec/pngenc: Deduplicate AVClasses

Message ID VI1PR0301MB215964A9AB4F404EB68CE9638F0E9@VI1PR0301MB2159.eurprd03.prod.outlook.com
State Accepted
Commit f41a9b331e6dd9da51c403686243c3f5a77474fd
Headers show
Series [FFmpeg-devel,01/41] avformat/Makefile: Add missing rawdec dependency for IPU demuxer | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 17, 2021, 2:31 a.m. UTC 
The child_class_next API relied on different (de)muxers to use
different AVClasses; yet this API has been replaced by
child_class_iterate.

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

Patch

diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index 9a9aee06f9..3ebcc1e571 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -1108,14 +1108,7 @@  static const AVOption options[] = {
 };
 
 static const AVClass pngenc_class = {
-    .class_name = "PNG encoder",
-    .item_name  = av_default_item_name,
-    .option     = options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
-static const AVClass apngenc_class = {
-    .class_name = "APNG encoder",
+    .class_name = "(A)PNG encoder",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
@@ -1161,6 +1154,6 @@  const AVCodec ff_apng_encoder = {
         AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE,
         AV_PIX_FMT_NONE
     },
-    .priv_class     = &apngenc_class,
+    .priv_class     = &pngenc_class,
     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };