diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
| commit | ff70e60176056daf646109b8e42654a3036fa02b (patch) | |
| tree | 42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/movenc.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e6241d6302..969104d631 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1588,7 +1588,8 @@ static int mov_write_trailer(AVFormatContext *s) return res; } -static AVOutputFormat mov_muxer = { +#ifdef CONFIG_MOV_MUXER +AVOutputFormat mov_muxer = { "mov", "mov format", NULL, @@ -1601,8 +1602,9 @@ static AVOutputFormat mov_muxer = { mov_write_trailer, .flags = AVFMT_GLOBALHEADER, }; - -static AVOutputFormat _3gp_muxer = { +#endif +#ifdef CONFIG_TGP_MUXER +AVOutputFormat tgp_muxer = { "3gp", "3gp format", NULL, @@ -1615,8 +1617,9 @@ static AVOutputFormat _3gp_muxer = { mov_write_trailer, .flags = AVFMT_GLOBALHEADER, }; - -static AVOutputFormat mp4_muxer = { +#endif +#ifdef CONFIG_MP4_MUXER +AVOutputFormat mp4_muxer = { "mp4", "mp4 format", "application/mp4", @@ -1629,8 +1632,9 @@ static AVOutputFormat mp4_muxer = { mov_write_trailer, .flags = AVFMT_GLOBALHEADER, }; - -static AVOutputFormat psp_muxer = { +#endif +#ifdef CONFIG_PSP_MUXER +AVOutputFormat psp_muxer = { "psp", "psp mp4 format", NULL, @@ -1643,8 +1647,9 @@ static AVOutputFormat psp_muxer = { mov_write_trailer, .flags = AVFMT_GLOBALHEADER, }; - -static AVOutputFormat _3g2_muxer = { +#endif +#ifdef CONFIG_TG2_MUXER +AVOutputFormat tg2_muxer = { "3g2", "3gp2 format", NULL, @@ -1657,13 +1662,4 @@ static AVOutputFormat _3g2_muxer = { mov_write_trailer, .flags = AVFMT_GLOBALHEADER, }; - -int movenc_init(void) -{ - av_register_output_format(&mov_muxer); - av_register_output_format(&_3gp_muxer); - av_register_output_format(&mp4_muxer); - av_register_output_format(&psp_muxer); - av_register_output_format(&_3g2_muxer); - return 0; -} +#endif |