.m1v and .m2a (feature req #1178960)
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Jul 2005 01:16:47 +0000 (01:16 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Jul 2005 01:16:47 +0000 (01:16 +0000)
Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/mp3.c
libavformat/raw.c

index ddc27de..f86d976 100644 (file)
@@ -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,
index a9e3a90..abfce00 100644 (file)
@@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = {
     "mpeg1video",
     "MPEG video",
     "video/x-mpeg",
-    "mpg,mpeg",
+    "mpg,mpeg,m1v",
     0,
     0,
     CODEC_ID_MPEG1VIDEO,