Mercurial > libavformat.hg

comparison riff.c @ 5043:3e581a9edb36 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.
author darkshikari
date Thu, 18 Jun 2009 19:31:12 +0000
parents 0d2573b3397b
children 33a244b7ca65
comparison
equal deleted inserted replaced
5042:05ecbb54e8bf 5043:3e581a9edb36
110 { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, 110 { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
111 { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, 111 { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') },
112 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, 112 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
113 { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, 113 { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
114 { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, 114 { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
115 { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
115 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, 116 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
116 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, 117 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
117 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ 118 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
118 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, 119 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
119 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, 120 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },