# HG changeset patch # User compn # Date 1231866610 0 # Node ID 41878938d030be4ce29f1f23772d8029b21c3c23 # Parent 66dacc0609187909c29da611e05441e0243e51cb add SLMJ fourcc to mjpeg diff -r 66dacc060918 -r 41878938d030 riff.c --- a/riff.c Tue Jan 13 00:20:18 2009 +0000 +++ b/riff.c Tue Jan 13 17:10:10 2009 +0000 @@ -117,6 +117,7 @@ { 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') },