mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
add another set of zlib guards
Originally committed as revision 5008 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1927cd41e0
commit
eff22cc98b
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user