summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-13 20:11:51 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-13 20:11:51 +0000
commita6199c83884a80fdb435c41485780110d8784716 (patch)
treec8ce4b773e8be3d1cd89ff6b7afd37181b738e17 /libao2
parent0fc19925988a7d07f18d3bcfade0876367ffa2c6 (diff)
downloadmpv-a6199c83884a80fdb435c41485780110d8784716.tar.bz2
mpv-a6199c83884a80fdb435c41485780110d8784716.tar.xz
fix for L<->R swap with 6ch playback - based on patch by Eric Lammerts <eric@lammerts.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6076 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_oss.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index ca8cfe108e..f818beff6d 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -121,7 +121,7 @@ static int init(int rate,int channels,int format,int flags){
}
#endif
- ao_data.bps=channels*rate;
+ ao_data.bps=channels;
if(format != AFMT_U8 && format != AFMT_S8)
ao_data.bps*=2;
@@ -209,6 +209,9 @@ ac3_retry:
#endif
}
+ ao_data.outburst-=ao_data.outburst % ao_data.bps; // round down
+ ao_data.bps*=rate;
+
return 1;
}