RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

.m1v and .m2a (feature req #1178960) 

Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-07-11 01:16:47 +00:00
parent 5b2ad9f520
commit e0827ba440
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mp3.c
View 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,

2
libavformat/raw.c
View File

@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = {
"mpeg1video",
"MPEG video",
"video/x-mpeg",
"mpg,mpeg",
"mpg,mpeg,m1v",
0,
0,
CODEC_ID_MPEG1VIDEO,