[SCM] libav/experimental: Some TIFFs declare -1 for the single strip height

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:33:58 UTC 2013


The following commit has been merged in the experimental branch:
commit 8eedffde316ced17c9909c7e03010c560121448b
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Mon Dec 22 06:47:51 2008 +0000

    Some TIFFs declare -1 for the single strip height
    
    Originally committed as revision 16267 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index d7738fc..7aff1da 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -293,6 +293,8 @@ 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;
         if(value < 1){
             av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
             return -1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list