summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-03-26 01:34:02 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-03-26 01:34:02 +0000
commitd4efacff64f8b07c24eabb38f855ff06a10dcc31 (patch)
tree38c75992a3c97211d804d6ef061d458b8d9fc405 /libavformat
parentbefa8e665c460244ba523131e6c22b19ab269e77 (diff)
Use intptr_t when casting pointers to int.
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avc.c2
-rw-r--r--libavformat/file.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/avc.c b/libavformat/avc.c
index 6ecea38a47..578e7d0462 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 bec991ae44..da0ce15094 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;
}