[SCM] libav/experimental: Use AV_R/WN32 instead of direct integer copying. Fixes decoding on at least Sparc/Solaris where unaligned accesses cause crashes. ML thread: http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/91414

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:46:38 UTC 2013


The following commit has been merged in the experimental branch:
commit 50352827f6444cf74fe37de9827c3ebb9a55fbcb
Author: Jeff Downs <heydowns at borg.com>
Date:   Wed May 27 18:59:24 2009 +0000

    Use AV_R/WN32 instead of direct integer copying.
    Fixes decoding on at least Sparc/Solaris where unaligned accesses cause
    crashes.
    ML thread: http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/91414
    
    Originally committed as revision 18967 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index e4114f8..8b31b5f 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -129,7 +129,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
         if ((mask & (1 << (--maskbit))) == 0) {
             if (destptr + 4 > destptr_end)
                 break;
-            *(int*)destptr = *(int*)srcptr;
+            AV_WN32(destptr, AV_RN32(srcptr));
             srclen -= 4;
             destptr += 4;
             srcptr += 4;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list