Some TIFFs declare -1 for the single strip height
authorKostya Shishkov <kostya.shishkov@gmail.com>
Mon, 22 Dec 2008 06:47:51 +0000 (06:47 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Mon, 22 Dec 2008 06:47:51 +0000 (06:47 +0000)
Originally committed as revision 16267 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/tiff.c

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