diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /video/filter/vf_phase.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'video/filter/vf_phase.c')
| -rw-r--r-- | video/filter/vf_phase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 45d5e4ae44..0b31ede5e5 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -205,7 +205,7 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) int pw[MP_MAX_PLANES] = {0}; for (int p = 0; p < mpi->num_planes; p++) - pw[p] = (mpi->w * mpi->fmt.bpp[p] + 7) / 8; + pw[p] = ((mpi->w * mpi->fmt.bpp[p] + 7) / 8) >> mpi->fmt.xs[p]; mode=vf->priv->mode; |