Browse Source

.m1v and .m2a (feature req #1178960)

Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 20 years ago
parent
commit
e0827ba440
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      libavformat/mp3.c
  2. +1
    -1
      libavformat/raw.c

+ 3
- 3
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,


+ 1
- 1
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,


Loading…
Cancel
Save