Mercurial > libavformat.hg

comparison riff.c @ 5429:2abcf559f2c2 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Partly) support Metasoft MJPEG Codec, fixes half of issue 1611.
author cehoyos
date Thu, 10 Dec 2009 23:06:23 +0000
parents 6255bca6b7a6
children 3f4dbd1e6548
comparison
equal deleted inserted replaced
5428:6255bca6b7a6 5429:2abcf559f2c2
136 { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ 136 { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
137 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ 137 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */
138 { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ 138 { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */
139 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, 139 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
140 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, 140 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
141 { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
141 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, 142 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
142 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, 143 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
143 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, 144 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
144 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, 145 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) },
145 { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, 146 { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) },