[SCM] libav/experimental: 10l

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:36:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 5b9d235fceb8aebcd072bddfb231f038c6c012c2
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jul 12 16:55:15 2003 +0000

    10l
    
    Originally committed as revision 2037 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index cf9042e..550672b 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'g') },
     { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
+    { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
     { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
     { CODEC_ID_HUFFYUV, MKTAG('h', 'f', 'y', 'u') },

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list