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/swf.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/swf.c')
| -rw-r--r-- | libavformat/swf.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libavformat/swf.c b/libavformat/swf.c index 14a1dc3907..67a63308d4 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -899,7 +899,8 @@ static int swf_read_close(AVFormatContext *s) return 0; } -static AVInputFormat swf_demuxer = { +#ifdef CONFIG_SWF_DEMUXER +AVInputFormat swf_demuxer = { "swf", "Flash format", sizeof(SWFContext), @@ -908,9 +909,9 @@ static AVInputFormat swf_demuxer = { swf_read_packet, swf_read_close, }; - -#ifdef CONFIG_MUXERS -static AVOutputFormat swf_muxer = { +#endif +#ifdef CONFIG_SWF_MUXER +AVOutputFormat swf_muxer = { "swf", "Flash format", "application/x-shockwave-flash", @@ -922,13 +923,4 @@ static AVOutputFormat swf_muxer = { swf_write_packet, swf_write_trailer, }; -#endif //CONFIG_MUXERS - -int swf_init(void) -{ - av_register_input_format(&swf_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&swf_muxer); -#endif //CONFIG_MUXERS - return 0; -} +#endif |