From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Sat, 26 Sep 2009 05:48:50 +0000 (+0000)
Subject: Fix decoding of TIFF CCITT RLE compressed data.
X-Git-Tag: android-x86-4.4-r1~25211
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8c7a3d2c120aebd983687f2a6790b9c76bbd339;p=android-x86%2Fexternal-ffmpeg.git

Fix decoding of TIFF CCITT RLE compressed data.
This fixes issue 1417.

Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 9a9d1f5528..215616309d 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -293,12 +293,14 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
                 return -1;
             }
         }else{
-            if(find_group3_syncmarker(&gb, srcsize*8) < 0)
+            if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
                 break;
             if(compr==TIFF_CCITT_RLE || 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);
+            if(compr==TIFF_CCITT_RLE && (get_bits_count(&gb) & 7))
+                skip_bits(&gb, 8 - (get_bits_count(&gb) & 7));
         }
         if(ret < 0){
             put_line(dst, stride, avctx->width, ref);