[SCM] libav/experimental: 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.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 56b44694bd540ad90e6b59e8345f608cb73a0135
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun May 31 09:16:06 2009 +0000

    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.
    
    Originally committed as revision 19035 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 39f8f25..6bc67f6 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -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 *avctx, void *data, int *data_size, AVPac
     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 *avctx, void *data, int *data_size, AVPac
         }
         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(AVCodecContext *avctx)
 
     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(AVCodecContext *avctx)
         }
         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(AVCodecContext *avctx)
 
     /* 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(AVCodecContext *avctx)
 
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
-#if CONFIG_ZLIB
+#if CONFIG_ZLIB_DECODER
     inflateEnd(&c->zstream);
 #endif
 

-- 
Libav/FFmpeg packaging