diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
| commit | d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb (patch) | |
| tree | 8f1d76f283da6022022a35e300c30faf93e71e83 /libao2 | |
| parent | 61c5a99851ea41449a513619dd68791c93e30ef3 (diff) | |
| download | mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.bz2 mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.xz | |
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_mpegpes.c | 1 | ||||
| -rw-r--r-- | libao2/ao_null.c | 2 | ||||
| -rw-r--r-- | libao2/ao_oss.c | 2 | ||||
| -rw-r--r-- | libao2/ao_plugin.c | 6 | ||||
| -rw-r--r-- | libao2/pl_delay.c | 1 | ||||
| -rw-r--r-- | libao2/pl_resample.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 3bd8cd9659..38d3b5deaa 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef HAVE_DVB #include <sys/ioctl.h> #endif diff --git a/libao2/ao_null.c b/libao2/ao_null.c index b5a5411a63..3add323ad8 100644 --- a/libao2/ao_null.c +++ b/libao2/ao_null.c @@ -19,7 +19,7 @@ LIBAO_EXTERN(null) struct timeval last_tv; int buffer; -static int drain(){ +static void drain(){ struct timeval now_tv; int temp, temp2; diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index 4af83e865c..29c913faca 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -55,7 +55,7 @@ static int control(int cmd,int arg){ case AOCONTROL_SET_VOLUME: { ao_control_vol_t *vol = (ao_control_vol_t *)arg; - int fd, v, mcmd, devs; + int fd, v, devs; if(ao_data.format == AFMT_AC3) return CONTROL_TRUE; diff --git a/libao2/ao_plugin.c b/libao2/ao_plugin.c index ad1934c8ff..449e127308 100644 --- a/libao2/ao_plugin.c +++ b/libao2/ao_plugin.c @@ -148,15 +148,15 @@ static int init(int rate,int channels,int format,int flags){ ao_plugin_data.delay_mult=1; ao_plugin_data.delay_fix=0; - for(i=0;i<NPL,plugin(i);i++){ + for(i=0;i<NPL && plugin(i);i++){ use_plugin[i]=plugin(i)->init(); if(!use_plugin[i]) plugin(i)->uninit(); } npl=i; - for(i=0;i<npl,plugin(i);i++) + for(i=0;i<npl && plugin(i);i++) if(!use_plugin[i+unused]){ unused++; - for(x=i;x<npl,plugin(x+1);x++) plugin(x)=plugin(x+1); + for(x=i;x<npl && plugin(x+1);x++) plugin(x)=plugin(x+1); plugin(x)=NULL; npl--; i--; diff --git a/libao2/pl_delay.c b/libao2/pl_delay.c index 32bec035eb..d194a5a3e1 100644 --- a/libao2/pl_delay.c +++ b/libao2/pl_delay.c @@ -55,7 +55,6 @@ static int control(int cmd,int arg){ // open & setup audio device // return: 1=success 0=fail static int init(){ - int i=0; float time_delay; // The time in [s] this plugin delays the output data /* If the output format of any of the below parameters differs from diff --git a/libao2/pl_resample.c b/libao2/pl_resample.c index 81012770ed..8cecb7bce8 100644 --- a/libao2/pl_resample.c +++ b/libao2/pl_resample.c @@ -172,7 +172,7 @@ static int play(){ } if(pl_resample.up>pl_resample.dn) return upsample(); - if(pl_resample.up<pl_resample.dn) +// if(pl_resample.up<pl_resample.dn) return downsample(); } |