From 145922a0700b50ffb38f20957c28020562f8d428 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Mar 2015 00:12:03 +0100 Subject: video: replace pointless macro Some old absurdity. --- video/filter/vf_stereo3d.c | 10 ++++------ video/memcpy_pic.h | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c index 886483cfe5..e370f07c24 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -322,20 +322,18 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) case ABOVE_BELOW_2_RL: case INTERLEAVE_ROWS_LR: case INTERLEAVE_ROWS_RL: - memcpy_pic2(dmpi->planes[0] + out_off_left, + memcpy_pic(dmpi->planes[0] + out_off_left, mpi->planes[0] + in_off_left, 3 * vf->priv->width, vf->priv->height, dmpi->stride[0] * vf->priv->row_step, - mpi->stride[0] * vf->priv->row_step, - vf->priv->row_step != 1); - memcpy_pic2(dmpi->planes[0] + out_off_right, + mpi->stride[0] * vf->priv->row_step); + memcpy_pic(dmpi->planes[0] + out_off_right, mpi->planes[0] + in_off_right, 3 * vf->priv->width, vf->priv->height, dmpi->stride[0] * vf->priv->row_step, - mpi->stride[0] * vf->priv->row_step, - vf->priv->row_step != 1); + mpi->stride[0] * vf->priv->row_step); break; case MONO_L: case MONO_R: diff --git a/video/memcpy_pic.h b/video/memcpy_pic.h index 01c874e151..437324a048 100644 --- a/video/memcpy_pic.h +++ b/video/memcpy_pic.h @@ -23,9 +23,6 @@ #include #include -#define my_memcpy_pic memcpy_pic -#define memcpy_pic2(d, s, b, h, ds, ss, unused) memcpy_pic(d, s, b, h, ds, ss) - static inline void memcpy_pic(void *dst, const void *src, int bytesPerLine, int height, int dstStride, int srcStride) -- cgit v1.2.3