[SCM] libav/experimental: fourcc CJPG is sequential jpeg

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:34:54 UTC 2013


The following commit has been merged in the experimental branch:
commit 949462b32ea273e80d701924765d0494a7ad199c
Author: Ben Littler <tempn at twmi.rr.com>
Date:   Thu Jan 8 17:51:03 2009 +0000

    fourcc CJPG is sequential jpeg
    
    Originally committed as revision 16496 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/riff.c b/libavformat/riff.c
index e9214d3..dd08dfc 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('C', 'J', 'P', 'G') },
     { CODEC_ID_HUFFYUV,      MKTAG('H', 'F', 'Y', 'U') },
     { CODEC_ID_FFVHUFF,      MKTAG('F', 'F', 'V', 'H') },
     { CODEC_ID_CYUV,         MKTAG('C', 'Y', 'U', 'V') },

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list