virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avformat/asfenc: Deduplicate AVClasses

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2021-06-07 16:13:33 +02:00
parent c64cfef91e
commit 63ad9ba4b5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/asfenc.c
View File

@ -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 */