RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix decoding of TIFF CCITT RLE compressed data. 

This fixes issue 1417.

Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-09-26 05:48:50 +00:00
parent 84e30ef992
commit a8c7a3d2c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/faxcompr.c
View File

@ -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);