Fixed warnings with PPC 64

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

diff --git a/core/ppc/mc.c b/core/ppc/mc.c
index 0aa6eccae9f4b01878b94be693225e237c949550..ea41325c0ee2769853dcb82efea9e34a2bf39289 100644 (file)
--- a/core/ppc/mc.c
+++ b/core/ppc/mc.c
@@ -162,7 +162,7 @@ static inline void mc_hh_w4( uint8_t *src, int i_src,
 static inline void mc_hh_w8( uint8_t *src, int i_src,
                              uint8_t *dst, int i_dst, int i_height )
 {
-    int x, y;
+    long x, y;
     DECLARE_ALIGNED( int16_t, tmp[8], 16 );
 
     LOAD_ZERO;

diff --git a/core/ppc/ppccommon.h b/core/ppc/ppccommon.h
index 3e2e7adb501f0f1a5d85e180446e5c2275f3e92e..dd8f23876bad5db6df2319a54b385458beaa3021 100644 (file)
--- a/core/ppc/ppccommon.h
+++ b/core/ppc/ppccommon.h
@@ -38,7 +38,7 @@
 /* Macros to load aligned or unaligned data without risking buffer
    overflows. */
 #define LOAD_16( p, v )                                \
-    if( (int) p & 0xF )                                \
+    if( (long) p & 0xF )                               \
     {                                                  \
         v = vec_perm( vec_ld( 0, p ), vec_ld( 16, p ), \
                       vec_lvsl( 0, p ) );              \
@@ -49,11 +49,11 @@
     }
 
 #define LOAD_8( p, v )                                             \
-    if( !( (int) p & 0xF ) )                                       \
+    if( !( (long) p & 0xF ) )                                      \
     {                                                              \
         v = vec_ld( 0, p );                                        \
     }                                                              \
-    else if( ( (int) p & 0xF ) < 9 )                               \
+    else if( ( (long) p & 0xF ) < 9 )                              \
     {                                                              \
         v = vec_perm( vec_ld( 0, p ), (vector unsigned char) zero, \
                       vec_lvsl( 0, p ) );                          \
@@ -65,11 +65,11 @@
     }
 
 #define LOAD_4( p, v )                                             \
-    if( !( (int) p & 0xF ) )                                       \
+    if( !( (long) p & 0xF ) )                                      \
     {                                                              \
         v = vec_ld( 0, p );                                        \
     }                                                              \
-    else if( ( (int) p & 0xF ) < 13 )                              \
+    else if( ( (long) p & 0xF ) < 13 )                             \
     {                                                              \
         v = vec_perm( vec_ld( 0, p ), (vector unsigned char) zero, \
                       vec_lvsl( 0, p ) );                          \
@@ -82,7 +82,7 @@
 
 /* Store aligned or unaligned data */
 #define STORE_16( v, p )                              \
-    if( (int) p & 0xF )                               \
+    if( (long) p & 0xF )                              \
     {                                                 \
         vector unsigned char tmp1, tmp2;              \
         vector unsigned char align, mask;             \