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 | 50e523144a24657f5a79c141486168a0228dd041 (patch) | |
| tree | 2261b442e0a5d19d9211cd97c2a40a02dda38db7 | |
| parent | 637e2c0a3eb61830274c86d1b1b27fd0524a0a45 (diff) | |
| download | ffmpeg-50e523144a24657f5a79c141486168a0228dd041.tar.gz | |
avformat/mpegenc: 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>
| -rw-r--r-- | libavformat/mpegenc.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 93c4920904..6aed527d50 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1280,16 +1280,14 @@ static const AVOption options[] = { { NULL }, }; -#define MPEGENC_CLASS(flavor) \ -static const AVClass flavor ## _class = { \ - .class_name = #flavor " muxer", \ - .item_name = av_default_item_name, \ - .version = LIBAVUTIL_VERSION_INT, \ - .option = options, \ +static const AVClass mpeg_class = { + .class_name = "mpeg/(s)vcd/vob/dvd muxer", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .option = options, }; #if CONFIG_MPEG1SYSTEM_MUXER -MPEGENC_CLASS(mpeg) const AVOutputFormat ff_mpeg1system_muxer = { .name = "mpeg", .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream"), @@ -1307,7 +1305,6 @@ const AVOutputFormat ff_mpeg1system_muxer = { #endif #if CONFIG_MPEG1VCD_MUXER -MPEGENC_CLASS(vcd) const AVOutputFormat ff_mpeg1vcd_muxer = { .name = "vcd", .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream (VCD)"), @@ -1319,12 +1316,11 @@ const AVOutputFormat ff_mpeg1vcd_muxer = { .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, .deinit = mpeg_mux_deinit, - .priv_class = &vcd_class, + .priv_class = &mpeg_class, }; #endif #if CONFIG_MPEG2VOB_MUXER -MPEGENC_CLASS(vob) const AVOutputFormat ff_mpeg2vob_muxer = { .name = "vob", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (VOB)"), @@ -1337,13 +1333,12 @@ const AVOutputFormat ff_mpeg2vob_muxer = { .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, .deinit = mpeg_mux_deinit, - .priv_class = &vob_class, + .priv_class = &mpeg_class, }; #endif /* Same as mpeg2vob_mux except that the pack size is 2324 */ #if CONFIG_MPEG2SVCD_MUXER -MPEGENC_CLASS(svcd) const AVOutputFormat ff_mpeg2svcd_muxer = { .name = "svcd", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (SVCD)"), @@ -1356,13 +1351,12 @@ const AVOutputFormat ff_mpeg2svcd_muxer = { .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, .deinit = mpeg_mux_deinit, - .priv_class = &svcd_class, + .priv_class = &mpeg_class, }; #endif /* Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */ #if CONFIG_MPEG2DVD_MUXER -MPEGENC_CLASS(dvd) const AVOutputFormat ff_mpeg2dvd_muxer = { .name = "dvd", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (DVD VOB)"), @@ -1375,6 +1369,6 @@ const AVOutputFormat ff_mpeg2dvd_muxer = { .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, .deinit = mpeg_mux_deinit, - .priv_class = &dvd_class, + .priv_class = &mpeg_class, }; #endif |