Mercurial > libavformat.hg

changeset 814:731af78f150d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.m1v and .m2a (feature req #1178960)
author michael
date Mon, 11 Jul 2005 01:16:47 +0000
parents 6d6973a9fd92
children 5f9e330500d9
files mp3.c raw.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mp3.c	Mon Jul 11 00:15:37 2005 +0000
+++ b/mp3.c	Mon Jul 11 01:16:47 2005 +0000
@@ -350,7 +350,7 @@
     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 @@
     "MPEG audio layer 2",
     "audio/x-mpeg",
 #ifdef CONFIG_MP3LAME
-    "mp2",
+    "mp2,m2a",
 #else
-    "mp2,mp3",
+    "mp2,mp3,m2a",
 #endif
     0,
     CODEC_ID_MP2,
--- a/raw.c	Mon Jul 11 00:15:37 2005 +0000
+++ b/raw.c	Mon Jul 11 01:16:47 2005 +0000
@@ -479,7 +479,7 @@
     "mpeg1video",
     "MPEG video",
     "video/x-mpeg",
-    "mpg,mpeg",
+    "mpg,mpeg,m1v",
     0,
     0,
     CODEC_ID_MPEG1VIDEO,