From: Fiona Glaser Date: Thu, 12 Jun 2008 15:17:49 +0000 (-0600) Subject: Fix regression in 64-bit in r882 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d108f91937cdb67b2bfa4f6e7fc1cf6b776febbf;p=libx264 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 572231ae..aaf584a2 100644 --- 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 4b149f28..59d17495 100644 --- 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];