Commit ed0879ed authored by Ben Littler's avatar Ben Littler
Browse files

add SLMJ fourcc to mjpeg

Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7a96cd31
......@@ -117,6 +117,7 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
{ CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
{ CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
{ CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */
{ CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
......
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