[Mplayer-cvslog] CVS: main/libao2 ao_win32.c,1.15,1.16

Sascha Sommer CVS syncmail at mplayerhq.hu
Fri Oct 22 14:43:37 CEST 2004


CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv5164/libao2

Modified Files:
	ao_win32.c 
Log Message:
ringbuffer variable intialization fix for multifile playback patch by Rune Petersen <rune.mail-list at mail.tele.dk>

Index: ao_win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_win32.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ao_win32.c	14 Aug 2004 10:03:26 -0000	1.15
+++ ao_win32.c	22 Oct 2004 12:43:34 -0000	1.16
@@ -166,7 +166,7 @@
 	
 	//fill waveformatex
     ZeroMemory( &wformat, sizeof(WAVEFORMATEXTENSIBLE));
-    wformat.Format.cbSize          = (channels>2)?sizeof(WAVEFORMATEXTENSIBLE):0;
+    wformat.Format.cbSize          = (channels>2)?sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX):0;
     wformat.Format.nChannels       = channels;                
     wformat.Format.nSamplesPerSec  = rate;            
     if(format == AFMT_AC3)
@@ -222,6 +222,10 @@
         waveBlocks[i].lpData = buffer;
         buffer += BUFFER_SIZE;
     }
+    buf_write=0;
+    buf_write_pos=0;
+    full_buffers=0;
+    buffered_bytes=0;
 
     return 1;
 }




More information about the MPlayer-cvslog mailing list