diff options
| author | wm4 <wm4@nowhere> | 2012-12-26 21:29:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 20:04:12 +0100 |
| commit | d88baf0754808e3252bfdfe37f78dbbe310bf17a (patch) | |
| tree | 5ac3e5b08d8266febe175d833dcad45bdf5d5ecc /video | |
| parent | c70cb26a1e0d31a04f8b92e04c08e726599b8780 (diff) | |
| download | mpv-d88baf0754808e3252bfdfe37f78dbbe310bf17a.tar.bz2 mpv-d88baf0754808e3252bfdfe37f78dbbe310bf17a.tar.xz | |
vf_pullup: remove check for MP_IMGFLAG_PLANAR
It supports 420p only, so the check is useless.
Diffstat (limited to 'video')
| -rw-r--r-- | video/filter/vf_pullup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c index 0a6e4c6b25..62d0ff653c 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -47,7 +47,6 @@ static void init_pullup(struct vf_instance *vf, mp_image_t *mpi) { struct pullup_context *c = vf->priv->ctx; - if (mpi->flags & MP_IMGFLAG_PLANAR) { c->format = PULLUP_FMT_Y; c->nplanes = 4; pullup_preinit_context(c); @@ -62,7 +61,6 @@ static void init_pullup(struct vf_instance *vf, mp_image_t *mpi) c->stride[1] = c->stride[2] = mpi->chroma_width; c->stride[3] = c->w[3]; c->background[1] = c->background[2] = 128; - } if (gCpuCaps.hasMMX) c->cpu |= PULLUP_CPU_MMX; if (gCpuCaps.hasMMX2) c->cpu |= PULLUP_CPU_MMX2; @@ -97,14 +95,12 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) } memcpy_pic(b->planes[0], mpi->planes[0], mpi->w, mpi->h, c->stride[0], mpi->stride[0]); - if (mpi->flags & MP_IMGFLAG_PLANAR) { memcpy_pic(b->planes[1], mpi->planes[1], mpi->chroma_width, mpi->chroma_height, c->stride[1], mpi->stride[1]); memcpy_pic(b->planes[2], mpi->planes[2], mpi->chroma_width, mpi->chroma_height, c->stride[2], mpi->stride[2]); - } } if (mpi->qscale) { memcpy(b->planes[3], mpi->qscale, c->w[3]); |