[SCM] libav/experimental: Do not attempt to decode TIFF files containing fax data with uncompressed mode allowed for there is no code to decode it (yet).

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:17 UTC 2013


The following commit has been merged in the experimental branch:
commit a8b95021e5c500c9d8fb56eb9d16260f508321d7
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Thu Oct 1 06:31:49 2009 +0000

    Do not attempt to decode TIFF files containing fax data with uncompressed
    mode allowed for there is no code to decode it (yet).
    
    Originally committed as revision 20114 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 27dd464..8818a66 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -139,6 +139,11 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
             av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
             return -1;
         }
+        if(s->fax_opts & 2){
+            av_log(s->avctx, AV_LOG_ERROR, "Uncompressed fax mode is not supported (yet)\n");
+            av_free(src2);
+            return -1;
+        }
         if(!s->fill_order){
             memcpy(src2, src, size);
         }else{

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list