generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tiffdec: Use the correct height field.

Browse Source 
Fixes Ticket913

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

Conflicts:
	libavcodec/tiff.c
This commit is contained in:
Piotr Bandurski
2013-01-06 01:56:23 +01:00
committed by Carl Eugen Hoyos
parent 42abae1125
commit 8b48e2c654
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/tiff.c
View File

@@ -436,7 +436,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
break; break;
case TIFF_ROWSPERSTRIP: case TIFF_ROWSPERSTRIP:
if(type == TIFF_LONG && value == -1) if(type == TIFF_LONG && value == -1)
value = s->avctx->height; value = s->height;
if(value < 1){ if(value < 1){
av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n"); av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
return -1; return -1;