[FFmpeg-cvslog] r19035 - trunk/libavcodec/lcldec.c

[reimar]

Author: reimar
Date: Sun May 31 11:16:06 2009
New Revision: 19035

Log:
lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
The zlib related code should not be compiled in when the decoder is disabled
and it thus will never be used, even if we have zlib available.

Modified:
   trunk/libavcodec/lcldec.c

Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c	Sun May 31 11:12:17 2009	(r19034)
+++ trunk/libavcodec/lcldec.c	Sun May 31 11:16:06 2009	(r19035)
@@ -45,7 +45,7 @@
 #include "get_bits.h"
 #include "lcl.h"
 
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
 #include <zlib.h>
 #endif
 
@@ -65,7 +65,7 @@ typedef struct LclDecContext {
     unsigned int decomp_size;
     // Decompression buffer
     unsigned char* decomp_buf;
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
     z_stream zstream;
 #endif
 } LclDecContext;
@@ -137,7 +137,7 @@ static int decode_frame(AVCodecContext *
     unsigned char yq, y1q, uq, vq;
     int uqvq;
     unsigned int mthread_inlen, mthread_outlen;
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
     int zret; // Zlib return code
 #endif
     unsigned int len = buf_size;
@@ -198,7 +198,7 @@ static int decode_frame(AVCodecContext *
         }
         break;
     case CODEC_ID_ZLIB:
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
         /* Using the original dll with normal compression (-1) and RGB format
          * gives a file with ZLIB fourcc, but frame is really uncompressed.
          * To be sure that's true check also frame size */
@@ -470,7 +470,7 @@ static av_cold int decode_init(AVCodecCo
 
     c->pic.data[0] = NULL;
 
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
     // Needed if zlib unused or init aborted before inflateInit
     memset(&c->zstream, 0, sizeof(z_stream));
 #endif
@@ -551,7 +551,7 @@ static av_cold int decode_init(AVCodecCo
         }
         break;
     case CODEC_ID_ZLIB:
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
         switch (c->compression) {
         case COMP_ZLIB_HISPEED:
             av_log(avctx, AV_LOG_INFO, "High speed compression.\n");
@@ -600,7 +600,7 @@ static av_cold int decode_init(AVCodecCo
 
     /* If needed init zlib */
     if (avctx->codec_id == CODEC_ID_ZLIB) {
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
         c->zstream.zalloc = Z_NULL;
         c->zstream.zfree = Z_NULL;
         c->zstream.opaque = Z_NULL;
@@ -629,7 +629,7 @@ static av_cold int decode_end(AVCodecCon
 
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
     inflateEnd(&c->zstream);
 #endif