Fix regression in 64-bit in r882

i_mvc needs to be 64-bit when used with a 64-bit memory pointer

diff --git a/common/common.h b/common/common.h
index 572231aea1babf360232c5f3fe54fdd515a87f59..aaf584a2de333da925cba22ba0cc3b0ba86166d0 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -130,7 +130,7 @@ static inline void x264_median_mv( int16_t *dst, int16_t *a, int16_t *b, int16_t
     dst[1] = x264_median( a[1], b[1], c[1] );
 }
 
-static inline int x264_predictor_difference( int16_t (*mvc)[2], int i_mvc )
+static inline int x264_predictor_difference( int16_t (*mvc)[2], intptr_t i_mvc )
 {
     int sum = 0, i;
     for( i = 0; i < i_mvc-1; i++ )

diff --git a/common/x86/util.h b/common/x86/util.h
index 4b149f28a3d7c1eb915c358c7e65df9a21e16b47..59d174950dd37c915d35621cfd42867454c79eb8 100644 (file)
--- a/common/x86/util.h
+++ b/common/x86/util.h
@@ -40,7 +40,7 @@ static inline void x264_median_mv_mmxext( int16_t *dst, int16_t *a, int16_t *b,
     );
 }
 #define x264_predictor_difference x264_predictor_difference_mmxext
-static inline int x264_predictor_difference_mmxext( int16_t (*mvc)[2], int i_mvc )
+static inline int x264_predictor_difference_mmxext( int16_t (*mvc)[2], intptr_t i_mvc )
 {
     int sum = 0;
     uint16_t output[4];