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:38:13 +0100 |
| commit | 8b48e2c654cd75ef960d71fedecdce1e1175b8ed (patch) | |
| tree | 5ca2b247977b8efa681e5426b20a818a83aaab71 | |
| parent | 42abae1125d778f4f39a049efaa19fe46fdc6672 (diff) | |
| download | ffmpeg-8b48e2c654cd75ef960d71fedecdce1e1175b8ed.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
| -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 1060a4403e..690d691e92 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -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; |