diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-16 23:50:02 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-16 23:50:02 +0000 |
| commit | b46f18e5d2e25d301b9e63e14ba4a877429be8e5 (patch) | |
| tree | bd21aba87535b35ff775d5ea7747b807839541d2 /libavformat/isom.c | |
| parent | e1d8d7bb4b64b5269fcc62b90f1ca26d97a1b36a (diff) | |
Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.
Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 34f69aa8d3..0e040c4546 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -195,6 +195,8 @@ 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_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 */ { CODEC_ID_MP3, 0x6D730055 }, /* MPEG layer 3 */ |