[FFmpeg-cvslog] r19043 - trunk/libavcodec/lcldec.c
reimar
subversion
Sun May 31 12:01:26 CEST 2009
Author: reimar
Date: Sun May 31 12:01:26 2009
New Revision: 19043
Log:
Correct calculation of compressed input length.
Modified:
trunk/libavcodec/lcldec.c
Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c Sun May 31 11:59:46 2009 (r19042)
+++ trunk/libavcodec/lcldec.c Sun May 31 12:01:26 2009 (r19043)
@@ -199,7 +199,7 @@ static int decode_frame(AVCodecContext *
mthread_outlen, mszh_dlen);
return -1;
}
- mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - mthread_inlen,
+ mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen,
c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
if (mthread_outlen != mszh_dlen) {
av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
@@ -242,7 +242,7 @@ static int decode_frame(AVCodecContext *
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);
if (ret < 0) return ret;
- ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen,
+ ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - 8 - mthread_inlen,
mthread_outlen, mthread_outlen);
if (ret < 0) return ret;
} else {
More information about the ffmpeg-cvslog
mailing list