From: Loren Merritt <pengvado@videolan.org>
Date: Fri, 30 Dec 2005 08:26:42 +0000 (+0000)
Subject: MSVC compatibility fixes
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a977f764240cb9139c2152448bb85dd89260639f;p=libx264

MSVC compatibility fixes



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

diff --git a/encoder/cabac.c b/encoder/cabac.c
index 3c3b51f0..a5bb58e4 100644
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -194,13 +194,13 @@ static void x264_cabac_mb_type( x264_t *h, x264_cabac_t *cb )
             static const int i_mb_bits[9*3][7] =
             {
                 { 1,1,0,0,0,1   }, { 1,1,0,0,1,0,  }, { 1,0,0 },       /* L0 L0 */
-                { 1,1,0,1,0,1   }, { 1,1,0,1,1,0   }, {},              /* L0 L1 */
-                { 1,1,1,0,0,0,0 }, { 1,1,1,0,0,0,1 }, {},              /* L0 BI */
-                { 1,1,0,1,1,1   }, { 1,1,1,1,1,0   }, {},              /* L1 L0 */
+                { 1,1,0,1,0,1   }, { 1,1,0,1,1,0   }, {0},             /* L0 L1 */
+                { 1,1,1,0,0,0,0 }, { 1,1,1,0,0,0,1 }, {0},             /* L0 BI */
+                { 1,1,0,1,1,1   }, { 1,1,1,1,1,0   }, {0},             /* L1 L0 */
                 { 1,1,0,0,1,1   }, { 1,1,0,1,0,0   }, { 1,0,1 },       /* L1 L1 */
-                { 1,1,1,0,0,1,0 }, { 1,1,1,0,0,1,1 }, {},              /* L1 BI */
-                { 1,1,1,0,1,0,0 }, { 1,1,1,0,1,0,1 }, {},              /* BI L0 */
-                { 1,1,1,0,1,1,0 }, { 1,1,1,0,1,1,1 }, {},              /* BI L1 */
+                { 1,1,1,0,0,1,0 }, { 1,1,1,0,0,1,1 }, {0},             /* L1 BI */
+                { 1,1,1,0,1,0,0 }, { 1,1,1,0,1,0,1 }, {0},             /* BI L0 */
+                { 1,1,1,0,1,1,0 }, { 1,1,1,0,1,1,1 }, {0},             /* BI L1 */
                 { 1,1,1,1,0,0,0 }, { 1,1,1,1,0,0,1 }, { 1,1,0,0,0,0 }, /* BI BI */
             };
 
diff --git a/encoder/me.c b/encoder/me.c
index 26ec3f47..66207613 100644
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -459,8 +459,8 @@ static void refine_subpel( x264_t *h, x264_me_t *m, int hpel_iters, int qpel_ite
 }
 
 #define BIME_CACHE2(a,b) \
-    BIME_CACHE( a, b) \
-    BIME_CACHE(-a,-b)
+    BIME_CACHE(a,b) \
+    BIME_CACHE(-(a),-(b))
 
 #define COST_BIMV_SATD( m0x, m0y, m1x, m1y ) \
 if( pass == 0 || !visited[(m0x)&7][(m0y)&7][(m1x)&7][(m1y)&7] ) \
@@ -491,8 +491,8 @@ if( pass == 0 || !visited[(m0x)&7][(m0y)&7][(m1x)&7][(m1y)&7] ) \
     COST_BIMV_SATD(om0x+a, om0y+b, om1x+c, om1y+d)
 
 #define CHECK_BIDIR2(a,b,c,d) \
-    CHECK_BIDIR( a ,b, c, d) \
-    CHECK_BIDIR(-a,-b,-c,-d)
+    CHECK_BIDIR(a,b,c,d) \
+    CHECK_BIDIR(-(a),-(b),-(c),-(d))
 
 #define CHECK_BIDIR8(a,b,c,d) \
     CHECK_BIDIR2(a,b,c,d) \