From 7ff7ac60e1f3b33a8e91c31ba79a8774feae2fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sun, 31 May 2009 08:36:44 +0000
Subject: [PATCH] Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is
never compiled if zlib is not available.
Originally committed as revision 19026 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/lclenc.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 011ce8ffcc3..8bae7c7f5fa 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -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 *avctx, unsigned char *buf, int buf_size,
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 *avctx, unsigned char *buf, int buf_size,
flush_put_bits(&c->pb);
return c->zstream.total_out;
-#endif
}
/*
@@ -144,11 +134,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
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(AVCodecContext *avctx)
}
return 0;
-#endif
}
/*
@@ -213,9 +197,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
av_freep(&avctx->extradata);
av_freep(&c->comp_buf);
-#if CONFIG_ZLIB
deflateEnd(&(c->zstream));
-#endif
return 0;
}
--
GitLab