aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-02-01 21:22:12 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-02-01 21:22:12 +0000
commit9f5aca8feca473e04b17b421d719b8dbb332bbd9 (patch)
tree05a4f7385f3c8b893b083202abfa69f81f90935a
parent55b557ece1b52d77af67636fef1e99a041576a3b (diff)
downloadffmpeg-9f5aca8feca473e04b17b421d719b8dbb332bbd9.tar.gz
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
-rw-r--r--libavformat/mp3.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 8602206bd1..0e9aa3ed09 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -652,11 +652,7 @@ AVOutputFormat mp2_muxer = {
"mp2",
NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
"audio/x-mpeg",
-#if CONFIG_LIBMP3LAME
"mp2,m2a",
-#else
- "mp2,mp3,m2a",
-#endif
0,
CODEC_ID_MP2,
CODEC_ID_NONE,