Mercurial > audlegacy
changeset 1131:961c5c6597ce trunk
[svn] Respect pointer signedness. Compiler is still unhappy about the constants shoved into guid_1 & guid_2 somehow, though.
| author | chainsaw |
|---|---|
| date | Sat, 03 Jun 2006 17:53:50 -0700 |
| parents | b60f95fa6dc8 |
| children | d63b74dd62a3 |
| files | Plugins/Input/wma/libffwma/file.c Plugins/Input/wma/libffwma/mms.c |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/wma/libffwma/file.c Sat Jun 03 16:12:12 2006 -0700 +++ b/Plugins/Input/wma/libffwma/file.c Sat Jun 03 17:53:50 2006 -0700 @@ -148,7 +148,7 @@ static int _mms_read(URLContext *h, unsigned char *buf, int size) { mms_t *mms = (mms_t *) h->priv_data; - return mms_read(mms, buf, size); + return mms_read(mms, (char*)buf, size); } static int _mms_close(URLContext *h)
--- a/Plugins/Input/wma/libffwma/mms.c Sat Jun 03 16:12:12 2006 -0700 +++ b/Plugins/Input/wma/libffwma/mms.c Sat Jun 03 17:53:50 2006 -0700 @@ -164,7 +164,7 @@ return total; } -static uint32_t get_32 (unsigned char *cmd, int offset) { +static uint32_t get_32 (char *cmd, int offset) { uint32_t ret; @@ -343,7 +343,7 @@ static void get_header (mms_t *this) { - unsigned char pre_header[8]; + char pre_header[8]; int i; this->asf_header_len = 0; @@ -372,7 +372,7 @@ packet_len); #endif - if (!receive (this->s, &this->asf_header[this->asf_header_len], packet_len)) { + if (!receive (this->s, (char*)&this->asf_header[this->asf_header_len], packet_len)) { printf ("libmms: header data read failed\n"); return; } @@ -437,7 +437,7 @@ i = 30; while (i<this->asf_header_len) { - uint64_t guid_1, guid_2, length; + uint64_t guid_1, guid_2, length; guid_2 = (uint64_t)this->asf_header[i] | ((uint64_t)this->asf_header[i+1]<<8) | ((uint64_t)this->asf_header[i+2]<<16) | ((uint64_t)this->asf_header[i+3]<<24) @@ -468,11 +468,11 @@ printf ("data object\n"); } else if ((guid_1 == 0x6553200cc000e48e) && (guid_2 == 0x11cfa9478cabdca1)) { - this->packet_length = get_32(this->asf_header, i+92-24); + this->packet_length = get_32((char*)this->asf_header, i+92-24); #ifdef LOG printf ("file object, packet length = %d (%d)\n", - this->packet_length, get_32(this->asf_header, i+96-24)); + this->packet_length, get_32((char*)this->asf_header, i+96-24)); #endif @@ -653,7 +653,7 @@ static int get_media_packet (mms_t *this) { - unsigned char pre_header[8]; + char pre_header[8]; int i; if (!receive (this->s, pre_header, 8)) {