[x264-devel] checkasm: fix build on ARM

Mans Rullgard git at videolan.org
Tue Dec 6 01:00:44 CET 2011


x264 | branch: master | Mans Rullgard <mans at mansr.com> | Mon Nov 28 16:29:12 2011 -0800| [f0ccc98bb747b8ee0fe9329f4205cf382788bb89] | committer: Jason Garrett-Glaser

checkasm: fix build on ARM
Because of how ALIGNED_ARRAY_16 is defined on ARM, array initialisers cannot be used here.  Use memset() instead.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=f0ccc98bb747b8ee0fe9329f4205cf382788bb89
---

 tools/checkasm.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/checkasm.c b/tools/checkasm.c
index 0c587ef..8fe7521 100644
--- a/tools/checkasm.c
+++ b/tools/checkasm.c
@@ -516,8 +516,10 @@ static int check_pixel( int cpu_ref, int cpu_new )
         set_func_name( #name ); \
         used_asm = 1; \
         ALIGNED_ARRAY_64( uint16_t, bitcosts,[17] ); \
-        ALIGNED_ARRAY_16( uint16_t, satds_c,[16] ) = {0}; \
-        ALIGNED_ARRAY_16( uint16_t, satds_a,[16] ) = {0}; \
+        ALIGNED_ARRAY_16( uint16_t, satds_c,[16] ); \
+        ALIGNED_ARRAY_16( uint16_t, satds_a,[16] ); \
+        memset( satds_c, 0, 16 * sizeof(*satds_c) ); \
+        memset( satds_a, 0, 16 * sizeof(*satds_a) ); \
         for( int i=0; i<17; i++ ) \
             bitcosts[i] = 9*(i!=8); \
         for( int i=0; i<32; i++ ) \



More information about the x264-devel mailing list