[SCM] libav/experimental: Correct calculation of compressed input length.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 21bf2f51d702dc80891004b7ce0f279aeed3787a
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun May 31 10:01:26 2009 +0000

    Correct calculation of compressed input length.
    
    Originally committed as revision 19043 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 5593567..ab8dd87 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -199,7 +199,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
                            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 *avctx, void *data, int *data_size, AVPac
             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 {

-- 
Libav/FFmpeg packaging