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/westwood.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/westwood.c')
-rw-r--r-- | libavformat/westwood.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 85977a89a3..be0ba95a41 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -357,7 +357,8 @@ static int wsvqa_read_close(AVFormatContext *s) return 0; } -static AVInputFormat wsaud_demuxer = { +#ifdef CONFIG_WSAUD_DEMUXER +AVInputFormat wsaud_demuxer = { "wsaud", "Westwood Studios audio format", sizeof(WsAudDemuxContext), @@ -366,8 +367,9 @@ static AVInputFormat wsaud_demuxer = { wsaud_read_packet, wsaud_read_close, }; - -static AVInputFormat wsvqa_demuxer = { +#endif +#ifdef CONFIG_WSVQA_DEMUXER +AVInputFormat wsvqa_demuxer = { "wsvqa", "Westwood Studios VQA format", sizeof(WsVqaDemuxContext), @@ -376,10 +378,4 @@ static AVInputFormat wsvqa_demuxer = { wsvqa_read_packet, wsvqa_read_close, }; - -int westwood_init(void) -{ - av_register_input_format(&wsaud_demuxer); - av_register_input_format(&wsvqa_demuxer); - return 0; -} +#endif |