1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 13:32:16 +00:00

video: replace pointless macro

Some old absurdity.
This commit is contained in:
wm4 2015-03-20 00:12:03 +01:00
parent 713a8c1a89
commit 145922a070
2 changed files with 4 additions and 9 deletions

View File

@ -322,20 +322,18 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
case ABOVE_BELOW_2_RL: case ABOVE_BELOW_2_RL:
case INTERLEAVE_ROWS_LR: case INTERLEAVE_ROWS_LR:
case INTERLEAVE_ROWS_RL: 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, mpi->planes[0] + in_off_left,
3 * vf->priv->width, 3 * vf->priv->width,
vf->priv->height, vf->priv->height,
dmpi->stride[0] * vf->priv->row_step, dmpi->stride[0] * vf->priv->row_step,
mpi->stride[0] * vf->priv->row_step, mpi->stride[0] * vf->priv->row_step);
vf->priv->row_step != 1); memcpy_pic(dmpi->planes[0] + out_off_right,
memcpy_pic2(dmpi->planes[0] + out_off_right,
mpi->planes[0] + in_off_right, mpi->planes[0] + in_off_right,
3 * vf->priv->width, 3 * vf->priv->width,
vf->priv->height, vf->priv->height,
dmpi->stride[0] * vf->priv->row_step, dmpi->stride[0] * vf->priv->row_step,
mpi->stride[0] * vf->priv->row_step, mpi->stride[0] * vf->priv->row_step);
vf->priv->row_step != 1);
break; break;
case MONO_L: case MONO_L:
case MONO_R: case MONO_R:

View File

@ -23,9 +23,6 @@
#include <string.h> #include <string.h>
#include <stddef.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, static inline void memcpy_pic(void *dst, const void *src,
int bytesPerLine, int height, int bytesPerLine, int height,
int dstStride, int srcStride) int dstStride, int srcStride)