# HG changeset patch # User reimar # Date 1243759004 0 # Node ID f36c5b72c4e3df542676ff55dc38a21914a84d7d # Parent 0d6f887d91fb3c4918bcfd5a845ee34ee9147c55 Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is never compiled if zlib is not available. diff -r 0d6f887d91fb -r f36c5b72c4e3 lclenc.c --- a/lclenc.c Sun May 31 06:51:18 2009 +0000 +++ b/lclenc.c Sun May 31 08:36:44 2009 +0000 @@ -45,9 +45,7 @@ #include "put_bits.h" #include "lcl.h" -#if CONFIG_ZLIB #include -#endif /* * Decoder context @@ -70,9 +68,7 @@ unsigned int max_comp_size; // Compression buffer unsigned char* comp_buf; -#if CONFIG_ZLIB z_stream zstream; -#endif } LclEncContext; /* @@ -87,11 +83,6 @@ int i; int zret; // Zlib return code -#if !CONFIG_ZLIB - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n"); - return -1; -#else - init_put_bits(&c->pb, buf, buf_size); *p = *pict; @@ -131,7 +122,6 @@ flush_put_bits(&c->pb); return c->zstream.total_out; -#endif } /* @@ -144,11 +134,6 @@ LclEncContext *c = avctx->priv_data; int zret; // Zlib return code -#if !CONFIG_ZLIB - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); - return 1; -#else - c->avctx= avctx; assert(avctx->width && avctx->height); @@ -199,7 +184,6 @@ } return 0; -#endif } /* @@ -213,9 +197,7 @@ av_freep(&avctx->extradata); av_freep(&c->comp_buf); -#if CONFIG_ZLIB deflateEnd(&(c->zstream)); -#endif return 0; }