]> git.sesse.net Git - x264/commitdiff
x86: correctly check stack alignment for Atom hadamard_ac
authorFiona Glaser <fiona@x264.com>
Sat, 2 Mar 2013 09:22:29 +0000 (01:22 -0800)
committerFiona Glaser <fiona@x264.com>
Tue, 23 Apr 2013 18:47:25 +0000 (11:47 -0700)
Regression in r2265 (only affected compilers with broken stack alignment,
like ICL on win32).

common/pixel.c

index 5027ab852e42f6d99d02053ff1e360cd1a3ef06a..dc341841d744105791134457cb2ad25c289c6f69 100644 (file)
@@ -1155,7 +1155,10 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
             pixf->satd[PIXEL_4x16]  = x264_pixel_satd_4x16_ssse3_atom;
             INIT6( satd_x3, _ssse3_atom );
             INIT6( satd_x4, _ssse3_atom );
-            INIT4( hadamard_ac, _ssse3_atom );
+            if( !(cpu&X264_CPU_STACK_MOD4) )
+            {
+                INIT4( hadamard_ac, _ssse3_atom );
+            }
 #if ARCH_X86_64
             pixf->sa8d_satd[PIXEL_16x16] = x264_pixel_sa8d_satd_16x16_ssse3_atom;
 #endif