# HG changeset patch # User ramiro # Date 1238031242 0 # Node ID dd9383951cb9db7431f81715ea93c9c109db8a93 # Parent 3ee8699e4f357d0ca49b2638503bd76f812ad098 Use intptr_t when casting pointers to int. diff -r 3ee8699e4f35 -r dd9383951cb9 avc.c --- a/avc.c Wed Mar 25 18:19:20 2009 +0000 +++ b/avc.c Thu Mar 26 01:34:02 2009 +0000 @@ -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 -r 3ee8699e4f35 -r dd9383951cb9 file.c --- a/file.c Wed Mar 25 18:19:20 2009 +0000 +++ b/file.c Thu Mar 26 01:34:02 2009 +0000 @@ -53,38 +53,38 @@ 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 @@ #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; }