From ed0879eda95c3cdce861216f82f6a3f0bae6d042 Mon Sep 17 00:00:00 2001
From: Ben Littler <tempn@twmi.rr.com>
Date: Tue, 13 Jan 2009 17:10:10 +0000
Subject: add SLMJ fourcc to mjpeg

Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/riff.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libavformat/riff.c')

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0f9b177c67..ed7d9a5f22 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -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') },
-- 
cgit v1.2.3