Mercurial > libavformat.hg
diff mp3.c @ 1169:d18cc9a1fd02 libavformat
allow individual selection of muxers and demuxers
author | mru |
---|---|
date | Mon, 10 Jul 2006 21:14:37 +0000 |
parents | d89d7ef290da |
children | 866d43ed0a67 |
line wrap: on
line diff
--- a/mp3.c Mon Jul 10 12:10:10 2006 +0000 +++ b/mp3.c Mon Jul 10 21:14:37 2006 +0000 @@ -368,6 +368,7 @@ } #endif //CONFIG_MUXERS +#ifdef CONFIG_MP3_DEMUXER AVInputFormat mp3_demuxer = { "mp3", "MPEG audio", @@ -378,8 +379,8 @@ mp3_read_close, .extensions = "mp2,mp3,m2a", /* XXX: use probe */ }; - -#ifdef CONFIG_MUXERS +#endif +#ifdef CONFIG_MP2_MUXER AVOutputFormat mp2_muxer = { "mp2", "MPEG audio layer 2", @@ -396,8 +397,8 @@ mp3_write_packet, mp3_write_trailer, }; - -#ifdef CONFIG_MP3LAME +#endif +#ifdef CONFIG_MP3_MUXER AVOutputFormat mp3_muxer = { "mp3", "MPEG audio layer 3", @@ -411,16 +412,3 @@ mp3_write_trailer, }; #endif -#endif //CONFIG_MUXERS - -int mp3_init(void) -{ - av_register_input_format(&mp3_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&mp2_muxer); -#ifdef CONFIG_MP3LAME - av_register_output_format(&mp3_muxer); -#endif -#endif //CONFIG_MUXERS - return 0; -}