Replace fast_memcpy() uses

fast_memcpy, defined in fastmemcpy.h, used to be mplayer's "optimized"
memcpy. It has been removed from this fork, and fast_memcpy has been
reduced to an alias for memcpy. Replace all remaining uses of the
fast_memcpy macro alias.

1 files changed, 4 insertions, 5 deletions

diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 68ccab07d2..9d189ef095 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -34,7 +34,6 @@
 #include "asfheader.h"
 #include "demuxer.h"
 #include "libmpcodecs/dec_audio.h"
-#include "libvo/fastmemcpy.h"
 
 // based on asf file-format doc by Eugene [http://divx.euro.ru]
 
@@ -77,12 +76,12 @@ static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv*
 	//i+=asf_scrambling_h*asf_scrambling_w;
 	for(x=0;x<asf->scrambling_w;x++)
 	  for(y=0;y<asf->scrambling_h;y++){
-	    fast_memcpy(dst+i,s2+(y*asf->scrambling_w+x)*asf->scrambling_b,asf->scrambling_b);
+	    memcpy(dst+i,s2+(y*asf->scrambling_w+x)*asf->scrambling_b,asf->scrambling_b);
 		i+=asf->scrambling_b;
 	  }
 	s2+=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b;
   }
-  //if(i<len) fast_memcpy(dst+i,src+i,len-i);
+  //if(i<len) memcpy(dst+i,src+i,len-i);
   free(*src);
   *src = dst;
 }
@@ -102,7 +101,7 @@ static void demux_asf_append_to_packet(demux_packet_t* dp,unsigned char *data,in
 {
   if(dp->len!=offs && offs!=-1) mp_msg(MSGT_DEMUX,MSGL_V,"warning! fragment.len=%d BUT next fragment offset=%d  \n",dp->len,offs);
   dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE);
-  fast_memcpy(dp->buffer+dp->len,data,len);
+  memcpy(dp->buffer+dp->len,data,len);
   memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE);
   mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len);
   dp->len+=len;
@@ -172,7 +171,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in
         return 0;
       }
       dp=new_demux_packet(len);
-      fast_memcpy(dp->buffer,data,len);
+      memcpy(dp->buffer,data,len);
       if (asf->asf_is_dvr_ms)
         dp->pts=time*0.0000001;
       else