Commit 9f5aca8f authored by Aurelien Jacobs's avatar Aurelien Jacobs

don't support the mp3 extension in the mp2 muxer

especially not under any conditionnal

Originally committed as revision 16922 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 55b557ec
...@@ -652,11 +652,7 @@ AVOutputFormat mp2_muxer = { ...@@ -652,11 +652,7 @@ AVOutputFormat mp2_muxer = {
"mp2", "mp2",
NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
"audio/x-mpeg", "audio/x-mpeg",
#if CONFIG_LIBMP3LAME
"mp2,m2a", "mp2,m2a",
#else
"mp2,mp3,m2a",
#endif
0, 0,
CODEC_ID_MP2, CODEC_ID_MP2,
CODEC_ID_NONE, CODEC_ID_NONE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment