# HG changeset patch # User Tony Vroon # Date 1241391636 -3600 # Node ID 90cdddf6f1c150df8f19a306590e00c92096e2b2 # Parent 0d47d41b39ec2725e7f2ed191801a6e2e0a5eea4 Flip signedness around to squelch ~15 warnings. diff -r 0d47d41b39ec -r 90cdddf6f1c1 src/aac/mp4ff/mp4atom.c --- a/src/aac/mp4ff/mp4atom.c Sun May 03 22:47:38 2009 +0100 +++ b/src/aac/mp4ff/mp4atom.c Mon May 04 00:00:36 2009 +0100 @@ -221,7 +221,7 @@ { uint64_t size; int32_t ret; - int8_t atom_header[8]; + uint8_t atom_header[8]; ret = mp4ff_read_data(f, atom_header, 8); if (ret != 8) diff -r 0d47d41b39ec -r 90cdddf6f1c1 src/aac/mp4ff/mp4ffint.h --- a/src/aac/mp4ff/mp4ffint.h Sun May 03 22:47:38 2009 +0100 +++ b/src/aac/mp4ff/mp4ffint.h Mon May 04 00:00:36 2009 +0100 @@ -241,8 +241,8 @@ /* mp4util.c */ -int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size); -int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size); +int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size); +int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size); uint64_t mp4ff_read_int64(mp4ff_t *f); uint32_t mp4ff_read_int32(mp4ff_t *f); uint32_t mp4ff_read_int24(mp4ff_t *f); diff -r 0d47d41b39ec -r 90cdddf6f1c1 src/aac/mp4ff/mp4tagupdate.c --- a/src/aac/mp4ff/mp4tagupdate.c Sun May 03 22:47:38 2009 +0100 +++ b/src/aac/mp4ff/mp4tagupdate.c Mon May 04 00:00:36 2009 +0100 @@ -144,7 +144,7 @@ bufptr = membuffer_get_ptr(buf); if (bufptr==0) return 0; - if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes) + if ((unsigned)mp4ff_read_data(src,(unsigned char*)bufptr + oldsize,bytes)!=bytes) { membuffer_set_error(buf); return 0; @@ -410,7 +410,7 @@ uint64_t atom_offset = base; for(;;) { - char atom_name[4]; + unsigned char atom_name[4]; uint32_t atom_size; mp4ff_set_position(f,atom_offset); diff -r 0d47d41b39ec -r 90cdddf6f1c1 src/aac/mp4ff/mp4util.c --- a/src/aac/mp4ff/mp4util.c Sun May 03 22:47:38 2009 +0100 +++ b/src/aac/mp4ff/mp4util.c Mon May 04 00:00:36 2009 +0100 @@ -31,7 +31,7 @@ #include "mp4ffint.h" #include -int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size) +int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size) { int32_t result = 1; @@ -47,7 +47,7 @@ return f->stream->truncate(f->stream->user_data); } -int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size) +int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size) { int32_t result = 1; @@ -108,13 +108,13 @@ { uint32_t result; uint32_t a, b, c, d; - int8_t data[4]; + uint8_t data[4]; mp4ff_read_data(f, data, 4); - a = (uint8_t)data[0]; - b = (uint8_t)data[1]; - c = (uint8_t)data[2]; - d = (uint8_t)data[3]; + a = data[0]; + b = data[1]; + c = data[2]; + d = data[3]; result = (a<<24) | (b<<16) | (c<<8) | d; return (uint32_t)result; @@ -124,12 +124,12 @@ { uint32_t result; uint32_t a, b, c; - int8_t data[4]; + uint8_t data[4]; mp4ff_read_data(f, data, 3); - a = (uint8_t)data[0]; - b = (uint8_t)data[1]; - c = (uint8_t)data[2]; + a = data[0]; + b = data[1]; + c = data[2]; result = (a<<16) | (b<<8) | c; return (uint32_t)result; @@ -139,11 +139,11 @@ { uint32_t result; uint32_t a, b; - int8_t data[2]; + uint8_t data[2]; mp4ff_read_data(f, data, 2); - a = (uint8_t)data[0]; - b = (uint8_t)data[1]; + a = data[0]; + b = data[1]; result = (a<<8) | b; return (uint16_t)result;