diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-11 01:16:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-11 01:16:47 +0000 |
| commit | e0827ba440dd6a58ba24bbbc8bf708441e5ff88e (patch) | |
| tree | a61bcc6ca89ad4f94432767907ead686e05ff3a1 /libavformat/mp3.c | |
| parent | 5b2ad9f520c77ab4b41dfb7086680770350a85ed (diff) | |
| download | ffmpeg-e0827ba440dd6a58ba24bbbc8bf708441e5ff88e.tar.gz | |
.m1v and .m2a (feature req #1178960)
Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index ddc27dea6f..f86d976eb8 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, |