[FFmpeg-cvslog] r18192 - in trunk: libavcodec/dsputil.c libavcodec/h263.c libavformat/avc.c libavformat/file.c

[ramiro]

Author: ramiro
Date: Thu Mar 26 02:34:02 2009
New Revision: 18192

Log:
Use intptr_t when casting pointers to int.

Modified:
   trunk/libavcodec/dsputil.c
   trunk/libavcodec/h263.c
   trunk/libavformat/avc.c
   trunk/libavformat/file.c

Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	Thu Mar 26 02:29:20 2009	(r18191)
+++ trunk/libavcodec/dsputil.c	Thu Mar 26 02:34:02 2009	(r18192)
@@ -4271,7 +4271,7 @@ int ff_check_alignment(void){
     static int did_fail=0;
     DECLARE_ALIGNED_16(int, aligned);
 
-    if((long)&aligned & 15){
+    if((intptr_t)&aligned & 15){
         if(!did_fail){
 #if HAVE_MMX || HAVE_ALTIVEC
             av_log(NULL, AV_LOG_ERROR,

Modified: trunk/libavcodec/h263.c
==============================================================================
--- trunk/libavcodec/h263.c	Thu Mar 26 02:29:20 2009	(r18191)
+++ trunk/libavcodec/h263.c	Thu Mar 26 02:34:02 2009	(r18192)
@@ -3056,7 +3056,7 @@ void ff_mpeg4_init_partitions(MpegEncCon
     uint8_t *start= pbBufPtr(&s->pb);
     uint8_t *end= s->pb.buf_end;
     int size= end - start;
-    int pb_size = (((long)start + size/3)&(~3)) - (long)start;
+    int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start;
     int tex_size= (size - 2*pb_size)&(~3);
 
     set_put_bits_buffer_size(&s->pb, pb_size);

Modified: trunk/libavformat/avc.c
==============================================================================
--- trunk/libavformat/avc.c	Thu Mar 26 02:29:20 2009	(r18191)
+++ trunk/libavformat/avc.c	Thu Mar 26 02:34:02 2009	(r18192)
@@ -25,7 +25,7 @@
 
 const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end)
 {
-    const uint8_t *a = p + 4 - ((long)p & 3);
+    const uint8_t *a = p + 4 - ((intptr_t)p & 3);
 
     for( end -= 3; p < a && p < end; p++ ) {
         if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

Modified: trunk/libavformat/file.c
==============================================================================
--- trunk/libavformat/file.c	Thu Mar 26 02:29:20 2009	(r18191)
+++ trunk/libavformat/file.c	Thu Mar 26 02:34:02 2009	(r18192)
@@ -53,38 +53,38 @@ static int file_open(URLContext *h, cons
     fd = open(filename, access, 0666);
     if (fd < 0)
         return AVERROR(ENOENT);
-    h->priv_data = (void *) fd;
+    h->priv_data = (void *) (intptr_t) fd;
     return 0;
 }
 
 static int file_read(URLContext *h, unsigned char *buf, int size)
 {
-    int fd = (int) h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return read(fd, buf, size);
 }
 
 static int file_write(URLContext *h, unsigned char *buf, int size)
 {
-    int fd = (int) h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return write(fd, buf, size);
 }
 
 /* XXX: use llseek */
 static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
-    int fd = (int) h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return lseek(fd, pos, whence);
 }
 
 static int file_close(URLContext *h)
 {
-    int fd = (int) h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return close(fd);
 }
 
 static int file_get_handle(URLContext *h)
 {
-    return (int) h->priv_data;
+    return (intptr_t) h->priv_data;
 }
 
 URLProtocol file_protocol = {
@@ -116,7 +116,7 @@ static int pipe_open(URLContext *h, cons
 #if HAVE_SETMODE
     setmode(fd, O_BINARY);
 #endif
-    h->priv_data = (void *) fd;
+    h->priv_data = (void *) (intptr_t) fd;
     h->is_streamed = 1;
     return 0;
 }