diff options
author | Måns Rullgård <mans@mansr.com> | 2006-07-11 01:14:37 +0400 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2006-07-11 01:14:37 +0400 |
commit | ff70e60176056daf646109b8e42654a3036fa02b (patch) | |
tree | 42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/rm.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/rm.c')
-rw-r--r-- | libavformat/rm.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c index e7cc4aa45a..f5b6a4ed06 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -1122,7 +1122,8 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index, return dts; } -static AVInputFormat rm_demuxer = { +#ifdef CONFIG_RM_DEMUXER +AVInputFormat rm_demuxer = { "rm", "rm format", sizeof(RMContext), @@ -1133,9 +1134,9 @@ static AVInputFormat rm_demuxer = { NULL, rm_read_dts, }; - -#ifdef CONFIG_MUXERS -static AVOutputFormat rm_muxer = { +#endif +#ifdef CONFIG_RM_MUXER +AVOutputFormat rm_muxer = { "rm", "rm format", "application/vnd.rn-realmedia", @@ -1147,13 +1148,4 @@ static AVOutputFormat rm_muxer = { rm_write_packet, rm_write_trailer, }; -#endif //CONFIG_MUXERS - -int rm_init(void) -{ - av_register_input_format(&rm_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&rm_muxer); -#endif //CONFIG_MUXERS - return 0; -} +#endif |