[SCM] libav/experimental: Replace complicated and currently broken manual alignment code by DECLARE_ALIGNED_16. Fixes crash in ff_snow_horizontal_compose97i_sse2

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:06:10 UTC 2013


The following commit has been merged in the experimental branch:
commit eafa1c90e573c14562987390d1001d4e636d5a74
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Thu Aug 30 11:41:58 2007 +0000

    Replace complicated and currently broken manual alignment code by
    DECLARE_ALIGNED_16. Fixes crash in ff_snow_horizontal_compose97i_sse2
    
    Originally committed as revision 10261 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/i386/snowdsp_mmx.c
index 561b43b..e43f7e9 100644
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/i386/snowdsp_mmx.c
@@ -25,9 +25,7 @@
 
 void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
     const int w2= (width+1)>>1;
-    // SSE2 code runs faster with pointers aligned on a 32-byte boundary.
-    IDWTELEM temp_buf[(width>>1) + 4];
-    IDWTELEM * const temp = temp_buf + 4 - (((int)temp_buf & 0xF) >> 2);
+    DECLARE_ALIGNED_16(IDWTELEM, temp[width>>1]);
     const int w_l= (width>>1);
     const int w_r= w2 - 1;
     int i;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list