Commit b46f18e5 authored by Jason Garrett-Glaser's avatar Jason Garrett-Glaser

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
parent e1d8d7bb
...@@ -195,6 +195,8 @@ const AVCodecTag codec_movaudio_tags[] = { ...@@ -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_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_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, 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 */ { CODEC_ID_MP3, 0x6D730055 }, /* MPEG layer 3 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment