summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-27 19:42:36 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-27 19:42:36 +0000
commit9d12ded2341c08ce18461f53180f84b6ebd86d5d (patch)
tree08175c76fb237dea0d673a2de5a6eaec6e1e1f40 /libmpcodecs
parent94101d2ccaf3a9b07c7a05421a777719ca09d6dd (diff)
downloadmpv-9d12ded2341c08ce18461f53180f84b6ebd86d5d.tar.bz2
mpv-9d12ded2341c08ce18461f53180f84b6ebd86d5d.tar.xz
fixes a bug when copying the image into a destination buffer smaller than the source.
This occurs when the destination buffer is packed but the source buffer uses aligned h&w. patch by John Koleszar < jkoleszar AH on2 POIS com > original thread: Date: Apr 11, 2006 4:27 PM Subject: [MPlayer-dev-eng] [PATCH] Chroma plane copy in vf_expand git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18322 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_expand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index e420597437..605ee5dc88 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -357,11 +357,11 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
vf->dmpi->stride[0],mpi->stride[0]);
memcpy_pic(vf->dmpi->planes[1]+
(vf->priv->exp_y>>mpi->chroma_y_shift)*vf->dmpi->stride[1]+(vf->priv->exp_x>>mpi->chroma_x_shift),
- mpi->planes[1], mpi->chroma_width, mpi->chroma_height,
+ mpi->planes[1], (mpi->w>>mpi->chroma_x_shift), (mpi->h>>mpi->chroma_y_shift),
vf->dmpi->stride[1],mpi->stride[1]);
memcpy_pic(vf->dmpi->planes[2]+
(vf->priv->exp_y>>mpi->chroma_y_shift)*vf->dmpi->stride[2]+(vf->priv->exp_x>>mpi->chroma_x_shift),
- mpi->planes[2], mpi->chroma_width, mpi->chroma_height,
+ mpi->planes[2], (mpi->w>>mpi->chroma_x_shift), (mpi->h>>mpi->chroma_y_shift),
vf->dmpi->stride[2],mpi->stride[2]);
} else {
memcpy_pic(vf->dmpi->planes[0]+