diff faxcompr.c @ 10304:370d05e51d90 libavcodec

Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them will be decoded correctly. This fixes issue 1423.

--- a/faxcompr.c	Mon Sep 28 05:15:27 2009 +0000
+++ b/faxcompr.c	Mon Sep 28 05:17:20 2009 +0000
@@ -269,7 +269,7 @@
 
 int ff_ccitt_unpack(AVCodecContext *avctx,
                        const uint8_t *src, int srcsize,
-                       uint8_t *dst, int height, int stride, enum TiffCompr compr)
+                       uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts)
 {
     int j;
     GetBitContext gb;
@@ -293,9 +293,10 @@
                 return -1;
             }
         }else{
+            int g3d1 = (compr == TIFF_G3) && !(opts & 1);
             if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
                 break;
-            if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
+            if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
                 ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
             else
                 ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);