summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-04-28 09:36:00 +0200
committerUoti Urpala <uau@mplayer2.org>2011-05-02 00:46:48 +0300
commit6506d4ad84eac67e69437def2c8ee69fcfc14ed5 (patch)
tree255e7f58b809a9bc7377047533cfb19399ce4ffd /stream
parent7e65428712beacd416dc3410c52f22ebfd3b4c53 (diff)
downloadmpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.bz2
mpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.xz
cleanup: remove more warnings
Diffstat (limited to 'stream')
-rw-r--r--stream/ai_alsa1x.c1
-rw-r--r--stream/asf_streaming.c2
-rw-r--r--stream/pnm.c2
-rw-r--r--stream/stream.h3
-rw-r--r--stream/stream_cdda.c2
-rw-r--r--stream/vcd_read.h3
6 files changed, 6 insertions, 7 deletions
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 3b9e878730..412e87ce05 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -108,7 +108,6 @@ int ai_alsa_setup(audio_in_t *ai)
}
snd_pcm_sw_params_current(ai->alsa.handle, swparams);
- err = snd_pcm_sw_params_set_sleep_min(ai->alsa.handle, swparams,0);
err = snd_pcm_sw_params_set_avail_min(ai->alsa.handle, swparams, ai->alsa.chunk_size);
err = snd_pcm_sw_params_set_start_threshold(ai->alsa.handle, swparams, 0);
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 891f519d28..73197f4f54 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -672,7 +672,7 @@ static int asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTT
len = (unsigned int)(end-pragma);
}
if(len > sizeof(features) - 1) {
- mp_tmsg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cut from %zd bytes to %d\n",pragma,len,sizeof(features) - 1);
+ mp_tmsg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cut from %zd bytes to %zd\n",pragma,len,sizeof(features) - 1);
len = sizeof(features) - 1;
}
strncpy( features, pragma, len );
diff --git a/stream/pnm.c b/stream/pnm.c
index 14ffa5d1c1..46c22361d9 100644
--- a/stream/pnm.c
+++ b/stream/pnm.c
@@ -417,7 +417,6 @@ static int pnm_write_chunk(uint16_t chunk_id, uint16_t length,
static void pnm_send_request(pnm_t *p, uint32_t bandwidth) {
- uint16_t i16;
int c=sizeof(pnm_header);
char fixme[]={0,1};
@@ -453,7 +452,6 @@ static void pnm_send_request(pnm_t *p, uint32_t bandwidth) {
/* client id string */
p->buffer[c]=PNA_CLIENT_STRING;
AV_WB16(&p->buffer[c+1], strlen(client_string)-1); /* don't know why do we have -1 here */
- memcpy(&p->buffer[c+1],&i16,2);
memcpy(&p->buffer[c+3],client_string,strlen(client_string)+1);
c=c+3+strlen(client_string)+1;
diff --git a/stream/stream.h b/stream/stream.h
index 94bfb0e343..77319871c0 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -229,7 +229,8 @@ inline static unsigned int stream_read_word_le(stream_t *s){
return (y<<8)|x;
}
-inline static unsigned int stream_read_dword_le(stream_t *s){
+inline static uint32_t stream_read_dword_le(stream_t *s)
+{
unsigned int y;
y=stream_read_char(s);
y|=stream_read_char(s)<<8;
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index aa459a7e3d..b768d25682 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -355,7 +355,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
}
cd_info = cd_info_new();
- mp_tmsg(MSGT_OPEN,MSGL_INFO,"Found audio CD with %d tracks.\n",cdda_tracks(cdd));
+ mp_tmsg(MSGT_OPEN,MSGL_INFO,"Found audio CD with %ld tracks.\n",cdda_tracks(cdd));
for(i=0;i<cdd->tracks;i++) {
char track_name[80];
long sec=cdda_track_firstsector(cdd,i+1);
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index 910561ad74..8b8d2ab817 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -62,7 +62,8 @@ static inline unsigned int vcd_get_msf(mp_vcd_priv_t* vcd){
vcd->entry.cdte_addr.msf.minute*60)*75 - 150;
}
-int vcd_seek_to_track(mp_vcd_priv_t* vcd,int track){
+static int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
+{
vcd->entry.cdte_format = CDROM_MSF;
vcd->entry.cdte_track = track;
if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {