MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggenc: 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 50e523144a
commit d0293c770b
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/oggenc.c
View File

@ -91,12 +91,11 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
#define OGG_CLASS(flavor, name)\ static const AVClass ogg_muxer_class = {
static const AVClass flavor ## _muxer_class = {\ .class_name = "Ogg (audio/video/Speex/Opus) muxer",
.class_name = #name " muxer",\ .item_name = av_default_item_name,
.item_name = av_default_item_name,\ .option = options,
.option = options,\ .version = LIBAVUTIL_VERSION_INT,
.version = LIBAVUTIL_VERSION_INT,\
}; };
static void ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) static void ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags)
@ -744,7 +743,6 @@ static void ogg_free(AVFormatContext *s)
} }
#if CONFIG_OGG_MUXER #if CONFIG_OGG_MUXER
OGG_CLASS(ogg, Ogg)
const AVOutputFormat ff_ogg_muxer = { const AVOutputFormat ff_ogg_muxer = {
.name = "ogg", .name = "ogg",
.long_name = NULL_IF_CONFIG_SMALL("Ogg"), .long_name = NULL_IF_CONFIG_SMALL("Ogg"),
@ -775,7 +773,6 @@ const AVOutputFormat ff_ogg_muxer = {
#endif #endif
#if CONFIG_OGA_MUXER #if CONFIG_OGA_MUXER
OGG_CLASS(oga, Ogg audio)
const AVOutputFormat ff_oga_muxer = { const AVOutputFormat ff_oga_muxer = {
.name = "oga", .name = "oga",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"),
@ -789,12 +786,11 @@ const AVOutputFormat ff_oga_muxer = {
.write_trailer = ogg_write_trailer, .write_trailer = ogg_write_trailer,
.deinit = ogg_free, .deinit = ogg_free,
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
.priv_class = &oga_muxer_class, .priv_class = &ogg_muxer_class,
}; };
#endif #endif
#if CONFIG_OGV_MUXER #if CONFIG_OGV_MUXER
OGG_CLASS(ogv, Ogg video)
const AVOutputFormat ff_ogv_muxer = { const AVOutputFormat ff_ogv_muxer = {
.name = "ogv", .name = "ogv",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Video"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Video"),
@ -811,12 +807,11 @@ const AVOutputFormat ff_ogv_muxer = {
.write_trailer = ogg_write_trailer, .write_trailer = ogg_write_trailer,
.deinit = ogg_free, .deinit = ogg_free,
.flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH,
.priv_class = &ogv_muxer_class, .priv_class = &ogg_muxer_class,
}; };
#endif #endif
#if CONFIG_SPX_MUXER #if CONFIG_SPX_MUXER
OGG_CLASS(spx, Ogg Speex)
const AVOutputFormat ff_spx_muxer = { const AVOutputFormat ff_spx_muxer = {
.name = "spx", .name = "spx",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"),
@ -830,12 +825,11 @@ const AVOutputFormat ff_spx_muxer = {
.write_trailer = ogg_write_trailer, .write_trailer = ogg_write_trailer,
.deinit = ogg_free, .deinit = ogg_free,
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
.priv_class = &spx_muxer_class, .priv_class = &ogg_muxer_class,
}; };
#endif #endif
#if CONFIG_OPUS_MUXER #if CONFIG_OPUS_MUXER
OGG_CLASS(opus, Ogg Opus)
const AVOutputFormat ff_opus_muxer = { const AVOutputFormat ff_opus_muxer = {
.name = "opus", .name = "opus",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"),
@ -849,6 +843,6 @@ const AVOutputFormat ff_opus_muxer = {
.write_trailer = ogg_write_trailer, .write_trailer = ogg_write_trailer,
.deinit = ogg_free, .deinit = ogg_free,
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
.priv_class = &opus_muxer_class, .priv_class = &ogg_muxer_class,
}; };
#endif #endif