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

[Piotr Bandurski]

ffmpeg | branch: release/0.7 | Piotr Bandurski <ami_stuff at o2.pl> | Sun Jan  6 01:56:23 2013 +0100| [fe9cbf582b094dff507df287bfa61b54755fa6c9] | 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)

Conflicts:
	libavcodec/tiff.c
(cherry picked from commit fe0e64ca6431c2f606bc702c1a4e230f22531a4f)

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

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

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index e43cecb..2ca6d5c 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -396,7 +396,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
         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");
             return -1;