From a8c7a3d2c120aebd983687f2a6790b9c76bbd339 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sat, 26 Sep 2009 05:48:50 +0000 Subject: Fix decoding of TIFF CCITT RLE compressed data. This fixes issue 1417. Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/faxcompr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/faxcompr.c') 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); -- cgit v1.2.3