[x264-devel] Fix pointer cast warning for 64-bit builds

[Anton Mitrofanov]

x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Sun Feb 23 15:52:57 2014 +0400| [8a2c8f64c4264e020224cfa34e0bb00990b0b1aa] | committer: Jason Garrett-Glaser

Fix pointer cast warning for 64-bit builds

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

 common/cpu.h      |    2 +-
 encoder/encoder.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/cpu.h b/common/cpu.h
index 158e102..3c10cd2 100644
--- 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 4f426ee..e5b58f5 100644
--- 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;