1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

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
This commit is contained in:
Andriy Rysin 2003-05-05 12:59:42 +00:00 committed by Michael Niedermayer
parent eeb67f400c
commit eb9ef61a81

View File

@ -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);