From eec69b399afc58b0f3215e32e9cae63ac2f1f9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 27 Sep 2009 09:43:11 +0000
Subject: [PATCH] =?UTF-8?q?Do=20not=20compile=20ZLib=20data=20uncompressin?=
=?UTF-8?q?g=20function=20in=20TIFF=20decoder=20when=20ZLib=20is=20not=20p?=
=?UTF-8?q?resent.=20Patch=20by=20Martin=20Storsj=C3=B6=20($firstname=20<a?=
=?UTF-8?q?t>=20$firstname=20<dot>=20two=20first=20letters=20of=20$lastnam?=
=?UTF-8?q?e)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/tiff.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 263f2874a1..c4f4523359 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -75,6 +75,7 @@ static int tget(const uint8_t **p, int type, int le){
}
}
+#if CONFIG_ZLIB
static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src, int size)
{
z_stream zstream;
@@ -95,6 +96,7 @@ static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src,
*len = zstream.total_out;
return zret == Z_STREAM_END ? Z_OK : zret;
}
+#endif
static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uint8_t *src, int size, int lines){
int c, line, pixels, code;