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/ffm.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ffm.c')
| -rw-r--r-- | libavformat/ffm.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libavformat/ffm.c b/libavformat/ffm.c index 3a0022450e..dbdb90d9fb 100644 --- a/libavformat/ffm.c +++ b/libavformat/ffm.c @@ -761,7 +761,8 @@ static int ffm_probe(AVProbeData *p) return 0; } -static AVInputFormat ffm_demuxer = { +#ifdef CONFIG_FFM_DEMUXER +AVInputFormat ffm_demuxer = { "ffm", "ffm format", sizeof(FFMContext), @@ -771,9 +772,9 @@ static AVInputFormat ffm_demuxer = { ffm_read_close, ffm_seek, }; - -#ifdef CONFIG_MUXERS -static AVOutputFormat ffm_muxer = { +#endif +#ifdef CONFIG_FFM_MUXER +AVOutputFormat ffm_muxer = { "ffm", "ffm format", "", @@ -786,13 +787,4 @@ static AVOutputFormat ffm_muxer = { ffm_write_packet, ffm_write_trailer, }; -#endif //CONFIG_MUXERS - -int ffm_init(void) -{ - av_register_input_format(&ffm_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&ffm_muxer); -#endif //CONFIG_MUXERS - return 0; -} +#endif //CONFIG_FFM_MUXER |