[FFmpeg-cvslog] r20058 - trunk/libavcodec/tiff.c

kostya subversion
Sun Sep 27 11:43:12 CEST 2009


Author: kostya
Date: Sun Sep 27 11:43:11 2009
New Revision: 20058

Log:
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)

Modified:
   trunk/libavcodec/tiff.c

Modified: trunk/libavcodec/tiff.c
==============================================================================
--- trunk/libavcodec/tiff.c	Sun Sep 27 11:33:37 2009	(r20057)
+++ trunk/libavcodec/tiff.c	Sun Sep 27 11:43:11 2009	(r20058)
@@ -75,6 +75,7 @@ static int tget(const uint8_t **p, int t
     }
 }
 
+#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,
     *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;



More information about the ffmpeg-cvslog mailing list