summaryrefslogtreecommitdiff
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2009-09-27 09:43:11 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-09-27 09:43:11 +0000
commiteec69b399afc58b0f3215e32e9cae63ac2f1f9c1 (patch)
tree1c8d0b3b0cbac8b9d428042763f3746e0ed5a28b /libavcodec/tiff.c
parent40e024091d70f335337b0490c91a5e31c4874b6b (diff)
downloadffmpeg-eec69b399afc58b0f3215e32e9cae63ac2f1f9c1.tar.gz
Do not compile ZLib data uncompressing function in TIFF decoder when ZLib is
not present. Patch by Martin Storsjö ($firstname <at> $firstname <dot> two first letters of $lastname) Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r--libavcodec/tiff.c2
1 files changed, 2 insertions, 0 deletions
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;