diff options
| author | Andriy Rysin <arysin@bcsii.net> | 2003-05-05 12:59:42 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-05-05 12:59:42 +0000 |
| commit | eb9ef61a81c0af06f5ee15ea7dfee009864b5e82 (patch) | |
| tree | 4e0b826650b8fccaf6e92c4f71025addc8ef3f83 | |
| parent | eeb67f400c3a0b9d1b93d6062565cc6bfff893f7 (diff) | |
| download | ffmpeg-eb9ef61a81c0af06f5ee15ea7dfee009864b5e82.tar.gz | |
prefers MP3 codec (rather than MP2) for output if
compiled with MP3LAME and output file seems to be of MP3 type patch by (Andriy Rysin <arysin at bcsii dot net>) with minor changes by me
Originally committed as revision 1834 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/raw.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index f6c0458fa8..b254124943 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -222,7 +222,11 @@ AVOutputFormat mp2_oformat = { "mp2", "MPEG audio layer 2", "audio/x-mpeg", +#ifdef CONFIG_MP3LAME + "mp2", +#else "mp2,mp3", +#endif 0, CODEC_ID_MP2, 0, @@ -231,6 +235,20 @@ AVOutputFormat mp2_oformat = { raw_write_trailer, }; +#ifdef CONFIG_MP3LAME +AVOutputFormat mp3_oformat = { + "mp3", + "MPEG audio layer 3", + "audio/x-mpeg", + "mp3", + 0, + CODEC_ID_MP3LAME, + 0, + raw_write_header, + raw_write_packet, + raw_write_trailer, +}; +#endif AVInputFormat ac3_iformat = { "ac3", @@ -525,7 +543,9 @@ int raw_init(void) { av_register_input_format(&mp3_iformat); av_register_output_format(&mp2_oformat); - +#ifdef CONFIG_MP3LAME + av_register_output_format(&mp3_oformat); +#endif av_register_input_format(&ac3_iformat); av_register_output_format(&ac3_oformat); |