summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-20 00:12:03 +0100
committerwm4 <wm4@nowhere>2015-03-20 00:12:03 +0100
commit145922a0700b50ffb38f20957c28020562f8d428 (patch)
tree1592b42290ae429011184f579aaaebad9f9fa94a
parent713a8c1a89f463b395990157774998994427357a (diff)
downloadmpv-145922a0700b50ffb38f20957c28020562f8d428.tar.bz2
mpv-145922a0700b50ffb38f20957c28020562f8d428.tar.xz
video: replace pointless macro
Some old absurdity.
-rw-r--r--video/filter/vf_stereo3d.c10
-rw-r--r--video/memcpy_pic.h3
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 <string.h>
#include <stddef.h>
-#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)