comparison riff.c @ 4205:41878938d030 libavformat

add SLMJ fourcc to mjpeg
author compn
date Tue, 13 Jan 2009 17:10:10 +0000
parents 84da7f1e6901
children c3102b189cb6
comparison
equal deleted inserted replaced
4204:66dacc060918 4205:41878938d030
115 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, 115 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
116 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, 116 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
117 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, 117 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
118 { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, 118 { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
119 { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, 119 { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
120 { CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */
120 { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ 121 { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
121 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, 122 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
122 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, 123 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
123 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, 124 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
124 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, 125 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) },