diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2013-04-10 00:10:59 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2013-04-10 00:22:00 +0200 |
| commit | f8d32b03bfa8ad733da7ae824a580b3474c1be58 (patch) | |
| tree | 1cf5e1172bbf1cd6308338dfb4d51e036d37d7b1 /video | |
| parent | 23bbbed06d9681728daa8f64190688c92562326a (diff) | |
| download | mpv-f8d32b03bfa8ad733da7ae824a580b3474c1be58.tar.bz2 mpv-f8d32b03bfa8ad733da7ae824a580b3474c1be58.tar.xz | |
vf_divtc, vf_phase: Fix handling of subsampled formats
These filters incorrectly calculated the amount of bytes per line
in each plane for chroma subsampled formats, causing undefined
behavior.
Diffstat (limited to 'video')
| -rw-r--r-- | video/filter/vf_divtc.c | 5 | ||||
| -rw-r--r-- | video/filter/vf_phase.c | 2 |
2 files changed, 4 insertions, 3 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; } 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; |