Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv13378 Modified Files: ao_plugin.c Log Message: Applying patch from Eric that fixes 6ch resampling Index: ao_plugin.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_plugin.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ao_plugin.c 7 Jun 2002 00:30:32 -0000 1.19 +++ ao_plugin.c 10 Jun 2002 12:10:52 -0000 1.20 @@ -250,14 +250,12 @@ // Limit length to avoid over flow in plugins int tmp = get_space(); int ret_len =(tmp<len)?tmp:len; + // keep all channels of each sample together + ret_len -= ret_len % (ao_plugin_local_data.channels*ao_plugin_local_data.bpm/8); if(ret_len){ // Filter data ao_plugin_data.len=ret_len; ao_plugin_data.data=data; - -// update plugins and uncoment that -// ao_plugin_data.channels=ao_plugin_local_data.channels; -// ao_plugin_data.format=ao_plugin_local_data.format; while(plugin(i)) plugin(i++)->play();