From d4efacff64f8b07c24eabb38f855ff06a10dcc31 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Thu, 26 Mar 2009 01:34:02 +0000
Subject: [PATCH] Use intptr_t when casting pointers to int.
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/dsputil.c | 2 +-
libavcodec/h263.c | 2 +-
libavformat/avc.c | 2 +-
libavformat/file.c | 14 +++++++-------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 86a6c377935..3e7bfc35e3a 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -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,
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index b2adae6e8a7..170513dc279 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -3056,7 +3056,7 @@ void ff_mpeg4_init_partitions(MpegEncContext *s)
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);
diff --git a/libavformat/avc.c b/libavformat/avc.c
index 6ecea38a475..578e7d04622 100644
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -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 )
diff --git a/libavformat/file.c b/libavformat/file.c
index bec991ae44d..da0ce150947 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -53,38 +53,38 @@ static int file_open(URLContext *h, const char *filename, int flags)
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, const char *filename, int flags)
#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;
}
--
GitLab