mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-29 20:56:12 +02:00
Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'
* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc': tiffdec: use a single strip if RowsPerStrip is 0 Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
75b4e40137
@ -704,14 +704,9 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
||||
}
|
||||
break;
|
||||
case TIFF_ROWSPERSTRIP:
|
||||
if (type == TIFF_LONG && value == UINT_MAX)
|
||||
if (!value || (type == TIFF_LONG && value == UINT_MAX))
|
||||
value = s->height;
|
||||
if (value < 1) {
|
||||
av_log(s->avctx, AV_LOG_ERROR,
|
||||
"Incorrect value of rows per strip\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
s->rps = value;
|
||||
s->rps = FFMIN(value, s->height);
|
||||
break;
|
||||
case TIFF_STRIP_OFFS:
|
||||
if (count == 1) {
|
||||
|
Loading…
Reference in New Issue
Block a user