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

ccitt fax: fix some group3 1d files without EOL 

Fixes Ticket832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-17 02:58:41 +02:00
parent 3d7817048c
commit 3a1ca240d9
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

@ -279,6 +279,7 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
int ret; int ret;
int runsize= avctx->width + 2; int runsize= avctx->width + 2;
int err = 0; int err = 0;
int has_eol;
runs = av_malloc(runsize * sizeof(runs[0])); runs = av_malloc(runsize * sizeof(runs[0]));
ref = av_malloc(runsize * sizeof(ref[0])); ref = av_malloc(runsize * sizeof(ref[0]));
@ -290,6 +291,7 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
ref[1] = 0; ref[1] = 0;
ref[2] = 0; ref[2] = 0;
init_get_bits(&gb, src, srcsize*8); init_get_bits(&gb, src, srcsize*8);
has_eol = show_bits(&gb, 12) == 1;
for(j = 0; j < height; j++){ for(j = 0; j < height; j++){
runend = runs + runsize; runend = runs + runsize;
if(compr == TIFF_G4){ if(compr == TIFF_G4){
@ -300,7 +302,7 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
} }
}else{ }else{
int g3d1 = (compr == TIFF_G3) && !(opts & 1); int g3d1 = (compr == TIFF_G3) && !(opts & 1);
if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0) if(compr!=TIFF_CCITT_RLE && has_eol && find_group3_syncmarker(&gb, srcsize*8) < 0)
break; break;
if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);