[FFmpeg-cvslog] r19045 - trunk/libavcodec/lcldec.c

reimar subversion
Sun May 31 12:14:27 CEST 2009


Author: reimar
Date: Sun May 31 12:14:27 2009
New Revision: 19045

Log:
Fix decoding of multithread-encoded lcl files on big-endian.

Modified:
   trunk/libavcodec/lcldec.c

Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c	Sun May 31 12:05:21 2009	(r19044)
+++ trunk/libavcodec/lcldec.c	Sun May 31 12:14:27 2009	(r19045)
@@ -189,9 +189,9 @@ static int decode_frame(AVCodecContext *
         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 *
             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;



More information about the ffmpeg-cvslog mailing list