aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Bandurski <ami_stuff@o2.pl>2013-01-06 01:56:23 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-07 00:29:28 +0100
commitd338632e9f8a255e8fc4b6efec1e7f7b65255fd8 (patch)
tree6c0044d3e7c064005efeca732629de026b0db685
parentbf19d4c6fa12c482cd460065104856bb8b19e519 (diff)
downloadffmpeg-d338632e9f8a255e8fc4b6efec1e7f7b65255fd8.tar.gz
tiffdec: Use the correct height field.
Fixes Ticket913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4784a135b2b0fe4d1b4c6256bd37265fc45aed3d)
-rw-r--r--libavcodec/tiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index a30e1a948a..256e096b7b 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -501,7 +501,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
break;
case TIFF_ROWSPERSTRIP:
if (type == TIFF_LONG && value == UINT_MAX)
- value = s->avctx->height;
+ value = s->height;
if (value < 1) {
av_log(s->avctx, AV_LOG_ERROR,
"Incorrect value of rows per strip\n");