Commit eec69b39 authored by Martin Storsjö's avatar Martin Storsjö Committed by Kostya Shishkov

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
parent 40e02409
...@@ -75,6 +75,7 @@ static int tget(const uint8_t **p, int type, int le){ ...@@ -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) static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src, int size)
{ {
z_stream zstream; z_stream zstream;
...@@ -95,6 +96,7 @@ static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src, ...@@ -95,6 +96,7 @@ static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src,
*len = zstream.total_out; *len = zstream.total_out;
return zret == Z_STREAM_END ? Z_OK : zret; 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){ 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; int c, line, pixels, code;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment