[x264-devel] commit: Fix regression in 64-bit in r882 (Jason Garrett-Glaser )

git version control git at videolan.org
Thu Jun 12 17:16:07 CEST 2008


x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Thu Jun 12 09:17:49 2008 -0600| [cfaac5c2494bab44ba0b034aff448c4fb27beb1c]

Fix regression in 64-bit in r882
i_mvc needs to be 64-bit when used with a 64-bit memory pointer

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=cfaac5c2494bab44ba0b034aff448c4fb27beb1c
---

 common/common.h   |    2 +-
 common/x86/util.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/common.h b/common/common.h
index 572231a..aaf584a 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 4b149f2..59d1749 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];



More information about the x264-devel mailing list