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/amr.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
| download | ffmpeg-ff70e60176056daf646109b8e42654a3036fa02b.tar.gz | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index b2e79420ab..ee0ea47f1b 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -215,7 +215,8 @@ static int amr_read_close(AVFormatContext *s) return 0; } -static AVInputFormat amr_demuxer = { +#ifdef CONFIG_AMR_DEMUXER +AVInputFormat amr_demuxer = { "amr", "3gpp amr file format", 0, /*priv_data_size*/ @@ -224,9 +225,10 @@ static AVInputFormat amr_demuxer = { amr_read_packet, amr_read_close, }; +#endif -#ifdef CONFIG_MUXERS -static AVOutputFormat amr_muxer = { +#ifdef CONFIG_AMR_MUXER +AVOutputFormat amr_muxer = { "amr", "3gpp amr file format", "audio/amr", @@ -239,12 +241,3 @@ static AVOutputFormat amr_muxer = { amr_write_trailer, }; #endif - -int amr_init(void) -{ - av_register_input_format(&amr_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&amr_muxer); -#endif - return 0; -} |