1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Use intptr_t when casting pointers to int.

Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2009-03-26 01:34:02 +00:00
parent befa8e665c
commit d4efacff64
4 changed files with 10 additions and 10 deletions

View File

@ -4271,7 +4271,7 @@ int ff_check_alignment(void){
static int did_fail=0; static int did_fail=0;
DECLARE_ALIGNED_16(int, aligned); DECLARE_ALIGNED_16(int, aligned);
if((long)&aligned & 15){ if((intptr_t)&aligned & 15){
if(!did_fail){ if(!did_fail){
#if HAVE_MMX || HAVE_ALTIVEC #if HAVE_MMX || HAVE_ALTIVEC
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,

View File

@ -3056,7 +3056,7 @@ void ff_mpeg4_init_partitions(MpegEncContext *s)
uint8_t *start= pbBufPtr(&s->pb); uint8_t *start= pbBufPtr(&s->pb);
uint8_t *end= s->pb.buf_end; uint8_t *end= s->pb.buf_end;
int size= end - start; 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); int tex_size= (size - 2*pb_size)&(~3);
set_put_bits_buffer_size(&s->pb, pb_size); set_put_bits_buffer_size(&s->pb, pb_size);

View File

@ -25,7 +25,7 @@
const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end) 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++ ) { for( end -= 3; p < a && p < end; p++ ) {
if( p[0] == 0 && p[1] == 0 && p[2] == 1 ) if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

View File

@ -53,38 +53,38 @@ static int file_open(URLContext *h, const char *filename, int flags)
fd = open(filename, access, 0666); fd = open(filename, access, 0666);
if (fd < 0) if (fd < 0)
return AVERROR(ENOENT); return AVERROR(ENOENT);
h->priv_data = (void *) fd; h->priv_data = (void *) (intptr_t) fd;
return 0; return 0;
} }
static int file_read(URLContext *h, unsigned char *buf, int size) 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); return read(fd, buf, size);
} }
static int file_write(URLContext *h, unsigned char *buf, int 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); return write(fd, buf, size);
} }
/* XXX: use llseek */ /* XXX: use llseek */
static int64_t file_seek(URLContext *h, int64_t pos, int whence) 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); return lseek(fd, pos, whence);
} }
static int file_close(URLContext *h) static int file_close(URLContext *h)
{ {
int fd = (int) h->priv_data; int fd = (intptr_t) h->priv_data;
return close(fd); return close(fd);
} }
static int file_get_handle(URLContext *h) static int file_get_handle(URLContext *h)
{ {
return (int) h->priv_data; return (intptr_t) h->priv_data;
} }
URLProtocol file_protocol = { URLProtocol file_protocol = {
@ -116,7 +116,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
#if HAVE_SETMODE #if HAVE_SETMODE
setmode(fd, O_BINARY); setmode(fd, O_BINARY);
#endif #endif
h->priv_data = (void *) fd; h->priv_data = (void *) (intptr_t) fd;
h->is_streamed = 1; h->is_streamed = 1;
return 0; return 0;
} }