From fdbe18b7b0545f9b5923d25a5433e4f735719ecc Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 30 Sep 2013 00:11:12 -0400 Subject: 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. --- libavcodec/tiff.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libavcodec/tiff.c') diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 0cfa4c4972..e7f1866a3b 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -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) { -- cgit v1.2.3