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_divtc.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_divtc.c')
| -rw-r--r-- | video/filter/vf_divtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index 5b57e5a4cb..b4718b355f 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -202,8 +202,9 @@ static int imgop(int(*planeop)(unsigned char *, unsigned char *, int sum = 0; for (int p = 0; p < dst->num_planes; p++) { sum += planeop(dst->planes[p], src ? src->planes[p] : NULL, - dst->w * (dst->fmt.bpp[p] / 8), dst->plane_h[p], - dst->stride[p], src ? src->stride[p] : 0, arg); + (dst->w * dst->fmt.bytes[p]) >> dst->fmt.xs[p], + dst->plane_h[p], dst->stride[p], + src ? src->stride[p] : 0, arg); } return sum; } |