aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-05-31 19:51:21 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-05-31 19:51:21 +0000
commit24dd21fa4179c31385d1815cb824f66b5038b20c (patch)
treea6662874839f8f2d56127490c5d805a8f3b91202
parent79183d3c3ef509543b47acc1b5e48e4285734f36 (diff)
downloadffmpeg-24dd21fa4179c31385d1815cb824f66b5038b20c.tar.gz
add #if CONFIG_ZLIB_DECODER around zlib_decomp function.
Fixes compilation when zlib is not available. Originally committed as revision 19069 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/lcldec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index a6e348bd8e..15c686e0a9 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -124,6 +124,7 @@ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsign
* \param offset offset in decomp_buf
* \param expected expected decompressed length
*/
+#if CONFIG_ZLIB_DECODER
static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, int offset, int expected)
{
LclDecContext *c = avctx->priv_data;
@@ -148,6 +149,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i
}
return c->zstream.total_out;
}
+#endif
/*