Fixed sig 11 caused by resampling plugin, some cosmetic changes and speed improvements

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

1 files changed, 7 insertions, 9 deletions

diff --git a/libao2/pl_delay.c b/libao2/pl_delay.c
index 70c5a37c69..3d0f457dc4 100644
--- a/libao2/pl_delay.c
+++ b/libao2/pl_delay.c
@@ -101,18 +101,16 @@ static void reset(){
 // processes 'ao_plugin_data.len' bytes of 'data'
 // called for every block of data
 static int play(){
-  int i=0;
-  int j=0;
-  int k=0;
   // Copy end of prev block to begining of buffer
-  for(i=0;i<ao_plugin_cfg.pl_delay_len;i++,j++)
-    ((char*)pl_delay.data)[j]=((char*)pl_delay.delay)[i];
+  memcpy(pl_delay.data,pl_delay.delay,ao_plugin_cfg.pl_delay_len);
   // Copy current block except end
-  for(i=0;i<ao_plugin_data.len-ao_plugin_cfg.pl_delay_len;i++,j++,k++)
-    ((char*)pl_delay.data)[j]=((char*)ao_plugin_data.data)[k];
+  memcpy(pl_delay.data+ao_plugin_cfg.pl_delay_len,
+  	 ao_plugin_data.data,
+  	 ao_plugin_data.len-ao_plugin_cfg.pl_delay_len);
   // Save away end of current block for next call
-  for(i=0;i<ao_plugin_cfg.pl_delay_len;i++,k++)
-    ((char*)pl_delay.delay)[i]=((char*)ao_plugin_data.data)[k];
+  memcpy(pl_delay.delay,
+	 ao_plugin_data.data+ao_plugin_data.len-ao_plugin_cfg.pl_delay_len,
+	 ao_plugin_cfg.pl_delay_len);
   // Set output data block
   ao_plugin_data.data=pl_delay.data;
   return 1;