From: Mike Melanson <mike@multimedia.cx>
Date: Sun, 12 Feb 2006 17:47:30 +0000 (+0000)
Subject: add another set of zlib guards
X-Git-Tag: v0.5~13138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eff22cc98b6e571bc8b3c4717e6f9ce243417e9a;p=platform%2Fupstream%2Flibav.git

add another set of zlib guards

Originally committed as revision 5008 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 52a755f..464ce52 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -298,11 +298,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
             av_log(avctx, AV_LOG_ERROR, "Unsupported (for now) format %i\n", c->fmt);
             return -1;
         }
+#ifdef CONFIG_ZLIB
         zret = inflateReset(&c->zstream);
         if (zret != Z_OK) {
             av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
             return -1;
         }
+#else
+        av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n");
+        return -1;
+#endif  /* CONFIG_ZLIB */
         if(c->fmt == ZMBV_FMT_8BPP) {
             c->bpp = 8;
             c->decode_intra = zmbv_decode_intra;