Mercurial > mplayer.hg
diff libmpdemux/asf_mmst_streaming.c @ 7953:60624e692b95
GCC warning fixes
author | bertrand |
---|---|
date | Tue, 29 Oct 2002 09:18:53 +0000 |
parents | 5bb4d8801a2c |
children | 0c660f21e0e4 |
line wrap: on
line diff
--- a/libmpdemux/asf_mmst_streaming.c Tue Oct 29 09:16:06 2002 +0000 +++ b/libmpdemux/asf_mmst_streaming.c Tue Oct 29 09:18:53 2002 +0000 @@ -133,8 +133,8 @@ static int get_data (int s, char *buf, size_t count) { - ssize_t len, total; - total = 0; + ssize_t len; + size_t total = 0; while (total < count) { @@ -161,7 +161,7 @@ static int get_header (int s, uint8_t *header, streaming_ctrl_t *streaming_ctrl) { unsigned char pre_header[8]; - int header_len,i ; + int header_len; header_len = 0; @@ -200,16 +200,16 @@ } else { - int packet_len; + int32_t packet_len; int command; char data[BUF_SIZE]; - if (!get_data (s, &packet_len, 4)) { + if (!get_data (s, (char*)&packet_len, 4)) { printf ("packet_len read failed\n"); return 0; } - packet_len = get_32 (&packet_len, 0) + 4; + packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4; // printf ("command packet detected, len=%d\n", packet_len); @@ -304,7 +304,6 @@ static int get_media_packet (int s, int padding, streaming_ctrl_t *stream_ctrl) { unsigned char pre_header[8]; - int i; char data[BUF_SIZE]; if (!get_data (s, pre_header, 8)) { @@ -333,14 +332,15 @@ } else { - int packet_len, command; + int32_t packet_len; + int command; - if (!get_data (s, &packet_len, 4)) { + if (!get_data (s, (char*)&packet_len, 4)) { printf ("packet_len read failed\n"); return 0; } - packet_len = get_32 (&packet_len, 0) + 4; + packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4; if (!get_data (s, data, packet_len)) { printf ("command data read failed\n"); @@ -415,6 +415,10 @@ asf_mmst_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) { return -1; + // Shut up gcc warning + fd++; + pos++; + streaming_ctrl=NULL; } int asf_mmst_streaming_start(stream_t *stream) @@ -426,7 +430,7 @@ int len, i, packet_length; char *path; URL_t *url1 = stream->streaming_ctrl->url; - int s; + int s = stream->fd; if( s>0 ) { close( stream->fd );