Commit 4bcc97ba authored by kostya's avatar kostya

Fix decoding of TIFF CCITT RLE compressed data.

This fixes issue 1417.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20025 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c7f20837
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment