summaryrefslogtreecommitdiff
path: root/libavcodec/zmbv.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2006-02-12 17:47:30 +0000
committerMike Melanson <mike@multimedia.cx>2006-02-12 17:47:30 +0000
commiteff22cc98b6e571bc8b3c4717e6f9ce243417e9a (patch)
treef79be337fe0b99429e0df76d4b21bd8f26e94748 /libavcodec/zmbv.c
parent1927cd41e087bf751d20bfb395addc1fd93bad29 (diff)
add another set of zlib guards
Originally committed as revision 5008 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/zmbv.c')
-rw-r--r--libavcodec/zmbv.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 52a755fe97..464ce52c62 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;