提交 eb9ef61a 编写于 作者: A Andriy Rysin 提交者: Michael Niedermayer

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
上级 eeb67f40
...@@ -222,7 +222,11 @@ AVOutputFormat mp2_oformat = { ...@@ -222,7 +222,11 @@ AVOutputFormat mp2_oformat = {
"mp2", "mp2",
"MPEG audio layer 2", "MPEG audio layer 2",
"audio/x-mpeg", "audio/x-mpeg",
#ifdef CONFIG_MP3LAME
"mp2",
#else
"mp2,mp3", "mp2,mp3",
#endif
0, 0,
CODEC_ID_MP2, CODEC_ID_MP2,
0, 0,
...@@ -231,6 +235,20 @@ AVOutputFormat mp2_oformat = { ...@@ -231,6 +235,20 @@ AVOutputFormat mp2_oformat = {
raw_write_trailer, 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 = { AVInputFormat ac3_iformat = {
"ac3", "ac3",
...@@ -525,7 +543,9 @@ int raw_init(void) ...@@ -525,7 +543,9 @@ int raw_init(void)
{ {
av_register_input_format(&mp3_iformat); av_register_input_format(&mp3_iformat);
av_register_output_format(&mp2_oformat); av_register_output_format(&mp2_oformat);
#ifdef CONFIG_MP3LAME
av_register_output_format(&mp3_oformat);
#endif
av_register_input_format(&ac3_iformat); av_register_input_format(&ac3_iformat);
av_register_output_format(&ac3_oformat); av_register_output_format(&ac3_oformat);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册