diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2013-01-06 01:56:23 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-07 00:43:03 +0100 |
| commit | fe9cbf582b094dff507df287bfa61b54755fa6c9 (patch) | |
| tree | a7e41d8f7a6f47d7dc884118fc95354c8606f298 | |
| parent | 80b8dc30dc96190b6f9c3ab1d9263490232b328b (diff) | |
| download | ffmpeg-fe9cbf582b094dff507df287bfa61b54755fa6c9.tar.gz | |
tiffdec: Use the correct height field.
Fixes Ticket913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4784a135b2b0fe4d1b4c6256bd37265fc45aed3d)
Conflicts:
libavcodec/tiff.c
(cherry picked from commit fe0e64ca6431c2f606bc702c1a4e230f22531a4f)
| -rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index e43cecb22c..2ca6d5ca62 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; |