diff mbox series

[FFmpeg-devel,04/41] avformat/asfenc: Deduplicate AVClasses

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

Patch

diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 8e29a3b733..a8a844ce6e 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -1154,14 +1154,14 @@  static const AVOption asf_options[] = {
     { NULL },
 };
 
-#if CONFIG_ASF_MUXER
 static const AVClass asf_muxer_class = {
-    .class_name     = "ASF muxer",
+    .class_name     = "ASF (stream) muxer",
     .item_name      = av_default_item_name,
     .option         = asf_options,
     .version        = LIBAVUTIL_VERSION_INT,
 };
 
+#if CONFIG_ASF_MUXER
 const AVOutputFormat ff_asf_muxer = {
     .name           = "asf",
     .long_name      = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),
@@ -1180,13 +1180,6 @@  const AVOutputFormat ff_asf_muxer = {
 #endif /* CONFIG_ASF_MUXER */
 
 #if CONFIG_ASF_STREAM_MUXER
-static const AVClass asf_stream_muxer_class = {
-    .class_name     = "ASF stream muxer",
-    .item_name      = av_default_item_name,
-    .option         = asf_options,
-    .version        = LIBAVUTIL_VERSION_INT,
-};
-
 const AVOutputFormat ff_asf_stream_muxer = {
     .name           = "asf_stream",
     .long_name      = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),
@@ -1200,6 +1193,6 @@  const AVOutputFormat ff_asf_stream_muxer = {
     .write_trailer  = asf_write_trailer,
     .flags          = AVFMT_GLOBALHEADER,
     .codec_tag      = asf_codec_tags,
-    .priv_class        = &asf_stream_muxer_class,
+    .priv_class     = &asf_muxer_class,
 };
 #endif /* CONFIG_ASF_STREAM_MUXER */