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/img2.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/img2.c')
| -rw-r--r-- | libavformat/img2.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 21bfb57da3..d3efc7a5b4 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -364,8 +364,8 @@ static int img_write_trailer(AVFormatContext *s) #endif /* CONFIG_MUXERS */ /* input */ - -static AVInputFormat image2_demuxer = { +#ifdef CONFIG_IMAGE2_DEMUXER +AVInputFormat image2_demuxer = { "image2", "image2 sequence", sizeof(VideoData), @@ -377,8 +377,9 @@ static AVInputFormat image2_demuxer = { NULL, AVFMT_NOFILE, }; - -static AVInputFormat image2pipe_demuxer = { +#endif +#ifdef CONFIG_IMAGE2PIPE_DEMUXER +AVInputFormat image2pipe_demuxer = { "image2pipe", "piped image2 sequence", sizeof(VideoData), @@ -388,12 +389,11 @@ static AVInputFormat image2pipe_demuxer = { img_read_close, NULL, }; +#endif - -#ifdef CONFIG_MUXERS /* output */ - -static AVOutputFormat image2_muxer = { +#ifdef CONFIG_IMAGE2_MUXER +AVOutputFormat image2_muxer = { "image2", "image2 sequence", "", @@ -406,8 +406,9 @@ static AVOutputFormat image2_muxer = { img_write_trailer, AVFMT_NOFILE, }; - -static AVOutputFormat image2pipe_muxer = { +#endif +#ifdef CONFIG_IMAGE2PIPE_MUXER +AVOutputFormat image2pipe_muxer = { "image2pipe", "piped image2 sequence", "", @@ -419,17 +420,4 @@ static AVOutputFormat image2pipe_muxer = { img_write_packet, img_write_trailer, }; -#endif /* CONFIG_MUXERS */ - -int img2_init(void) -{ - av_register_input_format(&image2_demuxer); - av_register_input_format(&image2pipe_demuxer); - -#ifdef CONFIG_MUXERS - av_register_output_format(&image2_muxer); - av_register_output_format(&image2pipe_muxer); #endif - - return 0; -} |