[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec zmbv.c,1.1,1.2

[Mike Melanson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv22002/libavcodec

Modified Files:
	zmbv.c 
Log Message:
add another set of zlib guards


Index: zmbv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/zmbv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zmbv.c	12 Feb 2006 08:53:29 -0000	1.1
+++ zmbv.c	12 Feb 2006 17:47:30 -0000	1.2
@@ -298,11 +298,16 @@
             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;