diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2009-06-17 00:37:06 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2009-06-17 00:37:06 +0000 |
| commit | 0b389aee4d224a9c1805338fd72dacdcb45e9a82 (patch) | |
| tree | 0952f0d765dfa12f753dd45a35c867386cea9614 /libavformat/isom.c | |
| parent | b46f18e5d2e25d301b9e63e14ba4a877429be8e5 (diff) | |
| download | ffmpeg-0b389aee4d224a9c1805338fd72dacdcb45e9a82.tar.gz | |
Add '.mp1' for MP1 audio in MOV/CAF.
Tested with streamcopy of 'mp1-sample.mp1' in incoming.
Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 0e040c4546..23d716fef3 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -195,6 +195,7 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */ { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */ + { CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') }, /* MPEG layer 1 */ { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') }, /* MPEG layer 2 */ { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */ |