Audio delay bugfix

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3138 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 3 insertions, 3 deletions

diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index d6e9c45ac4..82da0df89e 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -110,7 +110,7 @@ static int init(int rate,int channels,int format,int flags){
     return 0;
   }
 
-  ao_data.bps=(channels+1)*rate;
+  ao_data.bps=channels*rate;
   if(format != AFMT_U8 && format != AFMT_S8)
     ao_data.bps*=2;
 
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 616761a95c..ab00cdd24d 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -144,7 +144,7 @@ static int init(int rate,int channels,int format,int flags){
 		printf("SDL: using %s audio driver\n", ao_subdevice);
 	}
 
-	ao_data.bps=(channels+1)*rate;
+	ao_data.bps=channels*rate;
 	if(format != AFMT_U8 && format != AFMT_S8)
 	  ao_data.bps*=2;
 	
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c
index 925e2e211c..72c25044bd 100644
--- a/libao2/ao_sun.c
+++ b/libao2/ao_sun.c
@@ -459,6 +459,6 @@ static float get_delay(){
     if (info.play.samples && enable_sample_timing == RTSC_ENABLED)
 	return (float)(queued_samples - info.play.samples) / (float)byte_per_sec;
     else
-	return (flaot)((queued_bursts - info.play.eof) * ao_data.outburst) / (float)byte_per_sec;
+	return (float)((queued_bursts - info.play.eof) * ao_data.outburst) / (float)byte_per_sec;
 }