diff mbox series

[FFmpeg-devel,20/41] avformat/v210: Deduplicate AVClasses

Message ID VI1PR0301MB2159B8100AD0FD74C7B0E6E38F0E9@VI1PR0301MB2159.eurprd03.prod.outlook.com
State Accepted
Commit 34276e9287639524442fb7ce6bd0ced30b83a6f6
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>
---
 libavformat/v210.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/v210.c b/libavformat/v210.c
index 361fd2a625..24f71d4014 100644
--- a/libavformat/v210.c
+++ b/libavformat/v210.c
@@ -87,14 +87,14 @@  static const AVOption v210_options[] = {
     { NULL },
 };
 
-#if CONFIG_V210_DEMUXER
 static const AVClass v210_demuxer_class = {
-    .class_name = "v210 demuxer",
+    .class_name = "v210(x) demuxer",
     .item_name  = av_default_item_name,
     .option     = v210_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
+#if CONFIG_V210_DEMUXER
 const AVInputFormat ff_v210_demuxer = {
     .name           = "v210",
     .long_name      = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
@@ -109,13 +109,6 @@  const AVInputFormat ff_v210_demuxer = {
 #endif // CONFIG_V210_DEMUXER
 
 #if CONFIG_V210X_DEMUXER
-static const AVClass v210x_demuxer_class = {
-    .class_name = "v210x demuxer",
-    .item_name  = av_default_item_name,
-    .option     = v210_options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
 const AVInputFormat ff_v210x_demuxer = {
     .name           = "v210x",
     .long_name      = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
@@ -125,6 +118,6 @@  const AVInputFormat ff_v210x_demuxer = {
     .flags          = AVFMT_GENERIC_INDEX,
     .extensions     = "yuv10",
     .raw_codec_id   = AV_CODEC_ID_V210X,
-    .priv_class     = &v210x_demuxer_class,
+    .priv_class     = &v210_demuxer_class,
 };
 #endif // CONFIG_V210X_DEMUXER