diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-06-07 16:13:33 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-08 16:03:17 +0200 |
| commit | 63ad9ba4b527503d8777f3ff160fa55f55b77862 (patch) | |
| tree | 7a93a00d5decc0ff7ae7756e256c5017d9058818 /libavformat | |
| parent | c64cfef91ef86c43db16a506dd70b50f62453963 (diff) | |
| download | ffmpeg-63ad9ba4b527503d8777f3ff160fa55f55b77862.tar.gz | |
avformat/asfenc: Deduplicate AVClasses
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfenc.c | 13 |
1 files changed, 3 insertions, 10 deletions
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 */ |