[FFmpeg-cvslog] avcodec/pngenc: Deduplicate AVClasses

Andreas Rheinhardt git at videolan.org
Thu Jul 8 21:42:59 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Jun  7 16:13:33 2021 +0200| [f41a9b331e6dd9da51c403686243c3f5a77474fd] | committer: Andreas Rheinhardt

avcodec/pngenc: Deduplicate AVClasses

The child_class_next API relied on different AVCodecs to use
different AVClasses; yet this API has been replaced by
child_class_iterate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f41a9b331e6dd9da51c403686243c3f5a77474fd
---

 libavcodec/pngenc.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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,
 };



More information about the ffmpeg-cvslog mailing list