Commit f8725828 authored by michael's avatar michael

.m1v and .m2a (feature req #1178960)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4431 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 3c9ce6dc
......@@ -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,
......
......@@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = {
"mpeg1video",
"MPEG video",
"video/x-mpeg",
"mpg,mpeg",
"mpg,mpeg,m1v",
0,
0,
CODEC_ID_MPEG1VIDEO,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment