aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2006-11-13 11:27:36 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2006-11-13 11:27:36 +0000
commit213309782db6cd221a8d6785a5c96bb13e829ef3 (patch)
tree5f57c683e3bd17244c471b53f18bf1d50436a622 /libavcodec/tiff.c
parentd00026d062a830211515c4e0351e5e08db9b634a (diff)
downloadffmpeg-213309782db6cd221a8d6785a5c96bb13e829ef3.tar.gz
Decoder can decode many ZLib-packed strips
Originally committed as revision 7007 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r--libavcodec/tiff.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 423023cf26..ec7839cc82 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -110,10 +110,6 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, uint8_t *
if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){
outlen = width * lines;
- if(lines != s->height){
- av_log(s->avctx, AV_LOG_ERROR, "This decoder won't decode ZLib-packed TIFF with %i lines per strip\n", lines);
- return -1;
- }
zbuf = av_malloc(outlen);
if(uncompress(zbuf, &outlen, src, size) != Z_OK){
av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu)\n", outlen, (unsigned long)width * lines);