From e0827ba440dd6a58ba24bbbc8bf708441e5ff88e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 11 Jul 2005 01:16:47 +0000
Subject: [PATCH] .m1v and .m2a (feature req #1178960)
Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/mp3.c | 6 +++---
libavformat/raw.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index ddc27dea6f8..f86d976eb87 100644
--- 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 a9e3a90f42b..abfce00d304 100644
--- 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,
--
GitLab