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.

7 files changed, 14 insertions, 16 deletions

diff --git a/libmpcodecs/ad_mpg123.c b/libmpcodecs/ad_mpg123.c
index 7450b55c25..a3ce2cdcf6 100644
--- a/libmpcodecs/ad_mpg123.c
+++ b/libmpcodecs/ad_mpg123.c
@@ -36,8 +36,6 @@ static const ad_info_t info = {
 
 LIBAD_EXTERN(mpg123)
 
-#include "libvo/fastmemcpy.h"
-
 /* Reducing the ifdeffery to two main variants:
  *   1. most compatible to any libmpg123 version
  *   2. fastest variant with recent libmpg123 (>=1.14)
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index a263661592..561bc898d0 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/libmpcodecs/vf_down3dright.c
@@ -85,7 +85,7 @@ static void toright(unsigned char *dst[3], unsigned char *src[3],
 					*t++ = *sR++;
 			}
 			if (p->scaleh == 1) {
-				fast_memcpy(to + dst, to, dst);
+				memcpy(to + dst, to, dst);
                                 to += dst;
 			}
 			to += dst;
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c
index c623e11562..87a480d655 100644
--- a/libmpcodecs/vf_noise.c
+++ b/libmpcodecs/vf_noise.c
@@ -277,12 +277,12 @@ static void noise(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int
 	{
 		if(src==dst) return;
 
-		if(dstStride==srcStride) fast_memcpy(dst, src, srcStride*height);
+		if(dstStride==srcStride) memcpy(dst, src, srcStride*height);
 		else
 		{
 			for(y=0; y<height; y++)
 			{
-				fast_memcpy(dst, src, width);
+				memcpy(dst, src, width);
 				dst+= dstStride;
 				src+= srcStride;
 			}
diff --git a/libmpcodecs/vf_phase.c b/libmpcodecs/vf_phase.c
index f5d937ef70..568c8f1f45 100644
--- a/libmpcodecs/vf_phase.c
+++ b/libmpcodecs/vf_phase.c
@@ -63,8 +63,8 @@ static void do_plane(unsigned char *to, unsigned char *from,
 
    for(end=to+h*ts, buf=*bufp, top=1; to<end; from+=fs, to+=ts, buf+=w, top^=1)
       {
-      fast_memcpy(to, mode==(top?BOTTOM_FIRST:TOP_FIRST)?buf:from, w);
-      fast_memcpy(buf, from, w);
+      memcpy(to, mode==(top?BOTTOM_FIRST:TOP_FIRST)?buf:from, w);
+      memcpy(buf, from, w);
       }
    }
 
diff --git a/libmpcodecs/vf_pullup.c b/libmpcodecs/vf_pullup.c
index 83f2f88fb6..97f851f348 100644
--- a/libmpcodecs/vf_pullup.c
+++ b/libmpcodecs/vf_pullup.c
@@ -138,8 +138,8 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
 		}
 	}
 	if (mpi->qscale) {
-		fast_memcpy(b->planes[3], mpi->qscale, c->w[3]);
-		fast_memcpy(b->planes[3]+c->w[3], mpi->qscale, c->w[3]);
+		memcpy(b->planes[3], mpi->qscale, c->w[3]);
+		memcpy(b->planes[3]+c->w[3], mpi->qscale, c->w[3]);
 	}
 
 	p = mpi->fields & MP_IMGFIELD_TOP_FIRST ? 0 :
diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c
index 69d573cdc2..69368d6bf5 100644
--- a/libmpcodecs/vf_unsharp.c
+++ b/libmpcodecs/vf_unsharp.c
@@ -82,10 +82,10 @@ static void unsharp( uint8_t *dst, uint8_t *src, int dstStride, int srcStride, i
 	if( src == dst )
 	    return;
 	if( dstStride == srcStride )
-	    fast_memcpy( dst, src, srcStride*height );
+	    memcpy( dst, src, srcStride*height );
 	else
 	    for( y=0; y<height; y++, dst+=dstStride, src+=srcStride )
-		fast_memcpy( dst, src, width );
+		memcpy( dst, src, width );
 	return;
     }
 
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c
index 999ec56692..bb6595cdcd 100644
--- a/libmpcodecs/vf_yadif.c
+++ b/libmpcodecs/vf_yadif.c
@@ -66,13 +66,13 @@ static void store_ref(struct vf_priv_s *p, uint8_t *src[3], int src_stride[3], i
 
         memcpy_pic(p->ref[2][i], src[i], pn_width, pn_height, p->stride[i], src_stride[i]);
 
-        fast_memcpy(p->ref[2][i] +  pn_height   * p->stride[i],
+        memcpy(p->ref[2][i] +  pn_height   * p->stride[i],
                           src[i] + (pn_height-1)*src_stride[i], pn_width);
-        fast_memcpy(p->ref[2][i] + (pn_height+1)* p->stride[i],
+        memcpy(p->ref[2][i] + (pn_height+1)* p->stride[i],
                           src[i] + (pn_height-1)*src_stride[i], pn_width);
 
-        fast_memcpy(p->ref[2][i] -   p->stride[i], src[i], pn_width);
-        fast_memcpy(p->ref[2][i] - 2*p->stride[i], src[i], pn_width);
+        memcpy(p->ref[2][i] -   p->stride[i], src[i], pn_width);
+        memcpy(p->ref[2][i] - 2*p->stride[i], src[i], pn_width);
     }
 }
 
@@ -367,7 +367,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int
                 uint8_t *dst2= &dst[i][y*dst_stride[i]];
                 filter_line(p, dst2, prev, cur, next, w, refs, parity ^ tff);
             }else{
-                fast_memcpy(&dst[i][y*dst_stride[i]], &p->ref[1][i][y*refs], w);
+                memcpy(&dst[i][y*dst_stride[i]], &p->ref[1][i][y*refs], w);
             }
         }
     }