[MPlayer-G2-dev] CVS: g2/libao2 ao_win32.c,1.1.1.1,1.2

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/g2/libao2
In directory mail:/var2/tmp/cvs-serv25789/libao2

Modified Files:
	ao_win32.c 
Log Message:
sync to g1 and make it compile again

Index: ao_win32.c
===================================================================
RCS file: /cvsroot/mplayer/g2/libao2/ao_win32.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ao_win32.c	31 Jan 2004 20:16:18 -0000	1.1.1.1
+++ ao_win32.c	1 Feb 2004 09:08:10 -0000	1.2
@@ -1,6 +1,6 @@
 /******************************************************************************
  * ao_win32.c: Windows waveOut interface for MPlayer
- * Copyright (c) 2002 Sascha Sommer <saschasommer at freenet.de>.
+ * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer at freenet.de>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "../mp_msg.h"
-#include "../fastmemcpy.h"
+#include "../osdep/fastmemcpy.h"
 
 #define SAMPLESIZE   1024
 #define BUFFER_SIZE  4096
@@ -134,7 +134,7 @@
         ao_data.channels = wformat.nChannels = 2;
 	    ao_data.samplerate = wformat.nSamplesPerSec = 44100;
 	    ao_data.format = AFMT_S16_LE;
-	    ao_data.bps=ao_data.channels * ao_data.samplerate;
+	    ao_data.bps=ao_data.channels * ao_data.samplerate * 2;
 	    ao_data.buffersize=wformat.wBitsPerSample=16;
         wformat.nBlockAlign     = wformat.nChannels * (wformat.wBitsPerSample >> 3);
         wformat.nAvgBytesPerSec = wformat.nSamplesPerSec * wformat.nBlockAlign;