[FFmpeg-cvslog] tiffdec: Use the correct height field.

Piotr Bandurski git at videolan.org
Mon Jan 7 00:45:56 CET 2013


ffmpeg | branch: release/0.11 | Piotr Bandurski <ami_stuff at o2.pl> | Sun Jan  6 01:56:23 2013 +0100| [d338632e9f8a255e8fc4b6efec1e7f7b65255fd8] | committer: Carl Eugen Hoyos

tiffdec: Use the correct height field.

Fixes Ticket913

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d338632e9f8a255e8fc4b6efec1e7f7b65255fd8
---

 libavcodec/tiff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index a30e1a9..256e096 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");



More information about the ffmpeg-cvslog mailing list