From 81048def5872481a5ac8da67f616f94b9134a4d9 Mon Sep 17 00:00:00 2001 From: mplayer-svn Date: Tue, 21 Feb 2012 20:40:59 +0000 Subject: vf.c: increase default alignment values Adjust MPlayer default alignment values to match FFmpeg's. Fixes "stride changed" errors when using e.g. MPEG-2 decoder with -vf unsharp. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34753 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar --- libmpcodecs/vf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 1954224359..a31ec9e734 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -292,8 +292,7 @@ mp_image_t *vf_get_image(vf_instance_t *vf, unsigned int outfmt, if (h == -1) h = vf->h; - w2 = (mp_imgflag & MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE) ? - ((w + 15) & (~15)) : w; + w2 = (mp_imgflag & MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE) ? FFALIGN(w, 32) : w; if (vf->put_image == vf_next_put_image) { // passthru mode, if the filter uses the fallback/default put_image() @@ -398,8 +397,8 @@ mp_image_t *vf_get_image(vf_instance_t *vf, unsigned int outfmt, if (mp_imgflag & MP_IMGFLAG_PREFER_ALIGNED_STRIDE) { int align = (mpi->flags & MP_IMGFLAG_PLANAR && mpi->flags & MP_IMGFLAG_YUV) ? - (8 << mpi->chroma_x_shift) - 1 : 15; // OK? - w2 = ((w + align) & (~align)); + (16 << mpi->chroma_x_shift) - 1 : 32; // OK? + w2 = FFALIGN(w, align); if (mpi->width != w2) { // we have to change width... check if we CAN co it: int flags = vf->query_format(vf, outfmt); -- cgit v1.2.3