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 (file)
--- 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{