.m1v and .m2a (feature req #1178960)

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4431 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index ddc27dea6f8d7dfde8da834ed1bff27f7e6b0183..f86d976eb87972dcf17269cc865776f0e0c461bd 100644 (file)
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -350,7 +350,7 @@ AVInputFormat mp3_iformat = {
     mp3_read_header,
     mp3_read_packet,
     mp3_read_close,
-    .extensions = "mp2,mp3", /* XXX: use probe */
+    .extensions = "mp2,mp3,m2a", /* XXX: use probe */
 };
 
 #ifdef CONFIG_ENCODERS
@@ -359,9 +359,9 @@ AVOutputFormat mp2_oformat = {
     "MPEG audio layer 2",
     "audio/x-mpeg",
 #ifdef CONFIG_MP3LAME
-    "mp2",
+    "mp2,m2a",
 #else
-    "mp2,mp3",
+    "mp2,mp3,m2a",
 #endif
     0,
     CODEC_ID_MP2,

diff --git a/libavformat/raw.c b/libavformat/raw.c
index a9e3a90f42bca1380878d1bdd5acd5a7383cba06..abfce00d30458b7a28837f327d6cfec9fad150a4 100644 (file)
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = {
     "mpeg1video",
     "MPEG video",
     "video/x-mpeg",
-    "mpg,mpeg",
+    "mpg,mpeg,m1v",
     0,
     0,
     CODEC_ID_MPEG1VIDEO,