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

tiffdec: use a single strip if RowsPerStrip is 0 

The spec does not specify that 0 is an error condition, and there
are samples which use 0 when the whole image is in one strip.
This commit is contained in:
Justin Ruggles 2013-09-30 00:11:12 -04:00
parent 0a467a9b59
commit fdbe18b7b0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/tiff.c
View File

@ -418,14 +418,9 @@ static int tiff_decode_tag(TiffContext *s)
}
break;
case TIFF_ROWSPERSTRIP:
if (type == TIFF_LONG && value == UINT_MAX)
value = s->avctx->height;
if (value < 1) {
av_log(s->avctx, AV_LOG_ERROR,
"Incorrect value of rows per strip\n");
return AVERROR_INVALIDDATA;
}
s->rps = value;
if (!value || (type == TIFF_LONG && value == UINT_MAX))
value = s->height;
s->rps = FFMIN(value, s->height);
break;
case TIFF_STRIP_OFFS:
if (count == 1) {