[FFmpeg-devel] [PATCH] Warning fix: use intptr_t for integer pointer math

Daniel Verkamp daniel
Wed May 6 23:24:59 CEST 2009


Not tested, but presumably this was not correct on x86-64...
-------------- next part --------------
>From d8bba22ebfc6f3abfe419be0e96b043e705e0ea9 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel at drv.nu>
Date: Wed, 6 May 2009 16:19:59 -0500
Subject: [PATCH] Warning fix: use intptr_t for integer pointer math

libavcodec/x86/h264_i386.h: In function 'decode_significance_x86':
libavcodec/x86/h264_i386.h:41: warning: cast from pointer to integer of
different size
libavcodec/x86/h264_i386.h:42: warning: cast from pointer to integer of
different size
libavcodec/x86/h264_i386.h: In function 'decode_significance_8x8_x86':
libavcodec/x86/h264_i386.h:94: warning: cast from pointer to integer of
different size
---
 libavcodec/x86/h264_i386.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h
index 29b214a..9287e01 100644
--- a/libavcodec/x86/h264_i386.h
+++ b/libavcodec/x86/h264_i386.h
@@ -38,8 +38,8 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
                                    uint8_t *significant_coeff_ctx_base,
                                    int *index){
     void *end= significant_coeff_ctx_base + max_coeff - 1;
-    int minusstart= -(int)significant_coeff_ctx_base;
-    int minusindex= 4-(int)index;
+    intptr_t minusstart= -(intptr_t)significant_coeff_ctx_base;
+    intptr_t minusindex= 4-(intptr_t)index;
     int coeff_count;
     __asm__ volatile(
         "movl "RANGE    "(%3), %%esi            \n\t"
@@ -91,7 +91,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
 static int decode_significance_8x8_x86(CABACContext *c,
                                        uint8_t *significant_coeff_ctx_base,
                                        int *index, const uint8_t *sig_off){
-    int minusindex= 4-(int)index;
+    intptr_t minusindex= 4-(intptr_t)index;
     int coeff_count;
     x86_reg last=0;
     __asm__ volatile(
-- 
1.6.2.3



More information about the ffmpeg-devel mailing list