[FFmpeg-cvslog] tiffdec: Use the correct height field.
Piotr Bandurski
git at videolan.org
Mon Jan 7 00:46:02 CET 2013
ffmpeg | branch: release/0.9 | Piotr Bandurski <ami_stuff at o2.pl> | Sun Jan 6 01:56:23 2013 +0100| [8b48e2c654cd75ef960d71fedecdce1e1175b8ed] | 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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b48e2c654cd75ef960d71fedecdce1e1175b8ed
---
libavcodec/tiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 1060a44..690d691 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;
More information about the ffmpeg-cvslog
mailing list