[FFmpeg-cvslog] r19026 - trunk/libavcodec/lclenc.c

[reimar]

Author: reimar
Date: Sun May 31 10:36:44 2009
New Revision: 19026

Log:
Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is never compiled
if zlib is not available.

Modified:
   trunk/libavcodec/lclenc.c

Modified: trunk/libavcodec/lclenc.c
==============================================================================
--- trunk/libavcodec/lclenc.c	Sun May 31 08:51:18 2009	(r19025)
+++ trunk/libavcodec/lclenc.c	Sun May 31 10:36:44 2009	(r19026)
@@ -45,9 +45,7 @@
 #include "put_bits.h"
 #include "lcl.h"
 
-#if CONFIG_ZLIB
 #include <zlib.h>
-#endif
 
 /*
  * Decoder context
@@ -70,9 +68,7 @@ typedef struct LclEncContext {
     unsigned int max_comp_size;
     // Compression buffer
     unsigned char* comp_buf;
-#if CONFIG_ZLIB
     z_stream zstream;
-#endif
 } LclEncContext;
 
 /*
@@ -87,11 +83,6 @@ static int encode_frame(AVCodecContext *
     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 @@ static int encode_frame(AVCodecContext *
     flush_put_bits(&c->pb);
 
     return c->zstream.total_out;
-#endif
 }
 
 /*
@@ -144,11 +134,6 @@ static av_cold int encode_init(AVCodecCo
     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 @@ static av_cold int encode_init(AVCodecCo
     }
 
     return 0;
-#endif
 }
 
 /*
@@ -213,9 +197,7 @@ static av_cold int encode_end(AVCodecCon
 
     av_freep(&avctx->extradata);
     av_freep(&c->comp_buf);
-#if CONFIG_ZLIB
     deflateEnd(&(c->zstream));
-#endif
 
     return 0;
 }