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/wav.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/wav.c')
| -rw-r--r-- | libavformat/wav.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c index 77642ba62b..4d926a41d2 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -404,8 +404,8 @@ static int wav_read_seek(AVFormatContext *s, return pcm_read_seek(s, stream_index, timestamp, flags); } - -static AVInputFormat wav_demuxer = { +#ifdef CONFIG_WAV_DEMUXER +AVInputFormat wav_demuxer = { "wav", "wav format", sizeof(WAVContext), @@ -415,9 +415,9 @@ static AVInputFormat wav_demuxer = { wav_read_close, wav_read_seek, }; - -#ifdef CONFIG_MUXERS -static AVOutputFormat wav_muxer = { +#endif +#ifdef CONFIG_WAV_MUXER +AVOutputFormat wav_muxer = { "wav", "wav format", "audio/x-wav", @@ -429,13 +429,4 @@ static AVOutputFormat wav_muxer = { wav_write_packet, wav_write_trailer, }; -#endif //CONFIG_MUXERS - -int ff_wav_init(void) -{ - av_register_input_format(&wav_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&wav_muxer); -#endif //CONFIG_MUXERS - return 0; -} +#endif |