aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2008-12-22 06:47:51 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2008-12-22 06:47:51 +0000
commit8eedffde316ced17c9909c7e03010c560121448b (patch)
tree3e6ffe42f6be47f6c79e73b1a25de93f9c508741
parent89b4ec5c33cd818a809fea7f7658ea5db0fc2e29 (diff)
downloadffmpeg-8eedffde316ced17c9909c7e03010c560121448b.tar.gz
Some TIFFs declare -1 for the single strip height
Originally committed as revision 16267 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/tiff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index d7738fce75..7aff1da3be 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -293,6 +293,8 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
}
break;
case TIFF_ROWSPERSTRIP:
+ if(type == TIFF_LONG && value == -1)
+ value = s->avctx->height;
if(value < 1){
av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
return -1;