diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-03 19:14:03 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-05 07:52:30 +0200 |
| commit | a4ea00d021b2bda1b641a2f00c167cadedfe9d4c (patch) | |
| tree | 9518f4e1b6de886ca7cf805d5c7f79901109f16d /libavformat/movenc.c | |
| parent | 0ba1e1978d4016df42ed481a832e7539ebc48220 (diff) | |
| download | ffmpeg-a4ea00d021b2bda1b641a2f00c167cadedfe9d4c.tar.gz | |
lavc/lavf: use unique private classes.
This is needed by the new AVOptions API.
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b79bbe83c6..9e1a4ceaf2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -48,11 +48,12 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass mov_muxer_class = { - .class_name = "MOV/3GP/MP4/3G2 muxer", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, +#define MOV_CLASS(flavor)\ +static const AVClass flavor ## _muxer_class = {\ + .class_name = #flavor " muxer",\ + .item_name = av_default_item_name,\ + .option = options,\ + .version = LIBAVUTIL_VERSION_INT,\ }; //FIXME support 64 bit variant with wide placeholders @@ -2338,6 +2339,7 @@ static int mov_write_trailer(AVFormatContext *s) } #if CONFIG_MOV_MUXER +MOV_CLASS(mov) AVOutputFormat ff_mov_muxer = { .name = "mov", .long_name = NULL_IF_CONFIG_SMALL("MOV format"), @@ -2358,6 +2360,7 @@ AVOutputFormat ff_mov_muxer = { }; #endif #if CONFIG_TGP_MUXER +MOV_CLASS(tgp) AVOutputFormat ff_tgp_muxer = { .name = "3gp", .long_name = NULL_IF_CONFIG_SMALL("3GP format"), @@ -2370,10 +2373,11 @@ AVOutputFormat ff_tgp_muxer = { .write_trailer = mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, - .priv_class = &mov_muxer_class, + .priv_class = &tgp_muxer_class, }; #endif #if CONFIG_MP4_MUXER +MOV_CLASS(mp4) AVOutputFormat ff_mp4_muxer = { .name = "mp4", .long_name = NULL_IF_CONFIG_SMALL("MP4 format"), @@ -2391,10 +2395,11 @@ AVOutputFormat ff_mp4_muxer = { .write_trailer = mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, - .priv_class = &mov_muxer_class, + .priv_class = &mp4_muxer_class, }; #endif #if CONFIG_PSP_MUXER +MOV_CLASS(psp) AVOutputFormat ff_psp_muxer = { .name = "psp", .long_name = NULL_IF_CONFIG_SMALL("PSP MP4 format"), @@ -2411,10 +2416,11 @@ AVOutputFormat ff_psp_muxer = { .write_trailer = mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, - .priv_class = &mov_muxer_class, + .priv_class = &psp_muxer_class, }; #endif #if CONFIG_TG2_MUXER +MOV_CLASS(tg2) AVOutputFormat ff_tg2_muxer = { .name = "3g2", .long_name = NULL_IF_CONFIG_SMALL("3GP2 format"), @@ -2427,10 +2433,11 @@ AVOutputFormat ff_tg2_muxer = { .write_trailer = mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, - .priv_class = &mov_muxer_class, + .priv_class = &tg2_muxer_class, }; #endif #if CONFIG_IPOD_MUXER +MOV_CLASS(ipod) AVOutputFormat ff_ipod_muxer = { .name = "ipod", .long_name = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"), @@ -2444,6 +2451,6 @@ AVOutputFormat ff_ipod_muxer = { .write_trailer = mov_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, - .priv_class = &mov_muxer_class, + .priv_class = &ipod_muxer_class, }; #endif |