tiffdec: Use the correct height field.
authorPiotr Bandurski <ami_stuff@o2.pl>
Sun, 6 Jan 2013 00:56:23 +0000 (01:56 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 6 Jan 2013 23:38:13 +0000 (00:38 +0100)
Fixes Ticket913

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4784a135b2b0fe4d1b4c6256bd37265fc45aed3d)

Conflicts:
libavcodec/tiff.c

libavcodec/tiff.c

index 1060a44..690d691 100644 (file)
@@ -436,7 +436,7 @@ 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;
+            value = s->height;
         if(value < 1){
             av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
             return -1;