summaryrefslogtreecommitdiff
path: root/libavcodec/faxcompr.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-09-26 05:48:50 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-09-26 05:48:50 +0000
commita8c7a3d2c120aebd983687f2a6790b9c76bbd339 (patch)
tree06baa62da9c3260fc9cc56af942e9225ec1f4234 /libavcodec/faxcompr.c
parent84e30ef9927b1c2e497add27b909571ccb050cb9 (diff)
downloadffmpeg-a8c7a3d2c120aebd983687f2a6790b9c76bbd339.tar.gz
Fix decoding of TIFF CCITT RLE compressed data.
This fixes issue 1417. Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/faxcompr.c')
-rw-r--r--libavcodec/faxcompr.c4
1 files changed, 3 insertions, 1 deletions
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);