Fix pointer cast warning for 64-bit builds

diff --git a/common/cpu.h b/common/cpu.h
index 158e102e13f2f6d8f1f1c3d2116bad856ae0945a..3c10cd22560f23769c8bbf09b52c31085f1cf8fe 100644 (file)
--- a/common/cpu.h
+++ b/common/cpu.h
@@ -58,7 +58,7 @@ void     x264_safe_intel_cpu_indicator_init( void );
  * if it doesn't).
  */
 #if (ARCH_X86 || HAVE_32B_STACK_ALIGNMENT) && HAVE_MMX
-int x264_stack_align( void (*func)(), ... );
+intptr_t x264_stack_align( void (*func)(), ... );
 #define x264_stack_align(func,...) x264_stack_align((void (*)())func, __VA_ARGS__)
 #else
 #define x264_stack_align(func,...) func(__VA_ARGS__)

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 7590ac6b9d9ce2dafee5cdd7a632bb5051839718..fad8b3d9f5dc9abf5ce2b9b65874d6b93aed55c9 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2557,7 +2557,7 @@ static ALWAYS_INLINE void x264_bitstream_restore( x264_t *h, x264_bs_bak_t *bak,
     }
 }
 
-static int x264_slice_write( x264_t *h )
+static intptr_t x264_slice_write( x264_t *h )
 {
     int i_skip;
     int mb_xy, i_mb_x, i_mb_y;