RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 12:17:12 +00:00
Code Issues Releases Wiki Activity

vf.c: increase default alignment values

Browse Source 
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
This commit is contained in:
mplayer-svn 2012-02-21 20:40:59 +00:00 committed by wm4
parent 3dc0cfc1fe
commit 81048def58
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpcodecs/vf.c
View File

@ -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);