MSVC compatibility fix from Haali

git-svn-id: svn://svn.videolan.org/x264/trunk@556 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/common.h b/common/common.h
index ce3c27b50f496d1619ef74855709d5a9653d8754..a3973420478fdd064e160bf368ead8798630cf11 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -37,6 +37,11 @@
 #define X264_VERSION "" // no configure script for msvc
 #endif
 
+/* alloca */
+#ifdef _MSC_VER
+#define        alloca  _alloca
+#endif
+
 /* threads */
 #ifdef __WIN32__
 #include <windows.h>

diff --git a/common/pixel.c b/common/pixel.c
index fd557ff3b1677435c44e8ab04966f9c2c0c8d5eb..aabc69c3d2b91578de33431323e6d39b64b8be44 100644 (file)
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -379,9 +379,8 @@ float x264_pixel_ssim_wxh( x264_pixel_function_t *pf,
 {
     int x, y, z;
     float ssim = 0.0;
-    int sums[2][width/4+3][4];
-    int (*sum0)[4] = sums[0];
-    int (*sum1)[4] = sums[1];
+    int (*sum0)[4] = alloca(4 * (width/4+3) * sizeof(int));
+    int (*sum1)[4] = alloca(4 * (width/4+3) * sizeof(int));
     width >>= 2;
     height >>= 2;
     z = 0;