Commit 780a37c8 authored by darkshikari's avatar darkshikari

Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19219 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1ae368f9
...@@ -112,6 +112,7 @@ const AVCodecTag codec_bmp_tags[] = { ...@@ -112,6 +112,7 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
{ CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
{ CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
{ CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
{ CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
......
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