Commit 62455985 authored by Roberto Togni's avatar Roberto Togni

Right fix for older zlib version

Originally committed as revision 2696 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ccbfd4ba
...@@ -797,10 +797,6 @@ static int encode_init(AVCodecContext *avctx) ...@@ -797,10 +797,6 @@ static int encode_init(AVCodecContext *avctx)
return 1; return 1;
} }
if ((strlen(zlibVersion()) > 4) && (zlibVersion()[0] >= '1') && (zlibVersion()[2] >= '2')&&
(zlibVersion()[4] >= '0'))
c->max_comp_size = deflateBound(&(c->zstream), c->decomp_size);
else
/* Conservative upper bound taken from zlib v1.2.1 source */ /* Conservative upper bound taken from zlib v1.2.1 source */
c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) + c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) +
((c->decomp_size + 63) >> 6) + 11; ((c->decomp_size + 63) >> 6) + 11;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment