ffmpeg | branch: master | Luca Barbato <lu_z...@gentoo.org> | Sat Aug 23 02:42:18 2014 +0200| [f9f34cb9983ec6f4ef119c34b726d3b39c143110] | committer: Luca Barbato
ogg: Use separate classes for the aliases Unbreak 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9f34cb9983ec6f4ef119c34b726d3b39c143110 --- libavformat/oggenc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 8ef6765..489f010 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -84,14 +84,14 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass ogg_muxer_class = { - .class_name = "Ogg muxer", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, +#define OGG_CLASS(flavor)\ +static const AVClass flavor ## _muxer_class = {\ + .class_name = #flavor " muxer",\ + .item_name = av_default_item_name,\ + .option = options,\ + .version = LIBAVUTIL_VERSION_INT,\ }; - static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset) { int64_t pos = avio_tell(pb); @@ -628,6 +628,7 @@ static int ogg_write_trailer(AVFormatContext *s) } #if CONFIG_OGG_MUXER +OGG_CLASS(ogg) AVOutputFormat ff_ogg_muxer = { .name = "ogg", .long_name = NULL_IF_CONFIG_SMALL("Ogg"), @@ -646,6 +647,7 @@ AVOutputFormat ff_ogg_muxer = { #endif #if CONFIG_OGA_MUXER +OGG_CLASS(oga) AVOutputFormat ff_oga_muxer = { .name = "oga", .long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"), @@ -658,11 +660,12 @@ AVOutputFormat ff_oga_muxer = { .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, - .priv_class = &ogg_muxer_class, + .priv_class = &oga_muxer_class, }; #endif #if CONFIG_SPX_MUXER +OGG_CLASS(spx) AVOutputFormat ff_spx_muxer = { .name = "spx", .long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"), @@ -674,11 +677,12 @@ AVOutputFormat ff_spx_muxer = { .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, - .priv_class = &ogg_muxer_class, + .priv_class = &spx_muxer_class, }; #endif #if CONFIG_OPUS_MUXER +OGG_CLASS(opus) AVOutputFormat ff_opus_muxer = { .name = "opus", .long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"), @@ -690,6 +694,6 @@ AVOutputFormat ff_opus_muxer = { .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, - .priv_class = &ogg_muxer_class, + .priv_class = &opus_muxer_class, }; #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
