From 42c500af62fbe09e7a55ecd47fc72331fbe4ae02 Mon Sep 17 00:00:00 2001 From: Fiona Glaser Date: Sat, 2 Mar 2013 01:22:29 -0800 Subject: [PATCH] x86: correctly check stack alignment for Atom hadamard_ac Regression in r2265 (only affected compilers with broken stack alignment, like ICL on win32). --- common/pixel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/pixel.c b/common/pixel.c index 5027ab85..dc341841 100644 --- a/common/pixel.c +++ b/common/pixel.c @@ -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 -- 2.40.0