[SCM] libav/experimental: Fix decoding of multithread-encoded lcl files on big-endian.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 661cb0d4a9c467ccbbc6aa6b628b8461db9ecc05
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun May 31 10:14:27 2009 +0000

    Fix decoding of multithread-encoded lcl files on big-endian.
    
    Originally committed as revision 19045 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 51ce044..01b4b43 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -189,9 +189,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
         switch (c->compression) {
         case COMP_MSZH:
             if (c->flags & FLAG_MULTITHREAD) {
-                mthread_inlen = *(unsigned int*)encoded;
+                mthread_inlen = AV_RL32(encoded);
                 mthread_inlen = FFMIN(mthread_inlen, len - 8);
-                mthread_outlen = *(unsigned int*)(encoded+4);
+                mthread_outlen = AV_RL32(encoded+4);
                 mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
                 mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
                 if (mthread_outlen != mszh_dlen) {
@@ -236,9 +236,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
             break;
         if (c->flags & FLAG_MULTITHREAD) {
             int ret;
-            mthread_inlen = *(unsigned int*)encoded;
+            mthread_inlen = AV_RL32(encoded);
             mthread_inlen = FFMIN(mthread_inlen, len - 8);
-            mthread_outlen = *(unsigned int*)(encoded+4);
+            mthread_outlen = AV_RL32(encoded+4);
             mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
             ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);
             if (ret < 0) return ret;

-- 
Libav/FFmpeg packaging