[SCM] libav/experimental: add SLMJ fourcc to mjpeg

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:35:13 UTC 2013


The following commit has been merged in the experimental branch:
commit ed0879eda95c3cdce861216f82f6a3f0bae6d042
Author: Ben Littler <tempn at twmi.rr.com>
Date:   Tue Jan 13 17:10:10 2009 +0000

    add SLMJ fourcc to mjpeg
    
    Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0f9b177..ed7d9a5 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') },

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list