summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-03 03:32:45 +0200
committerwm4 <wm4@nowhere>2012-08-03 03:34:39 +0200
commit14b545eb2a8650dbffebd0194bdb4d53e530d14e (patch)
treedbaa83dd068c774ab92ba24742a08af298f060b5 /libmpcodecs
parentf0965d83560496b6b522a881b618cc03eb09ebcb (diff)
downloadmpv-14b545eb2a8650dbffebd0194bdb4d53e530d14e.tar.bz2
mpv-14b545eb2a8650dbffebd0194bdb4d53e530d14e.tar.xz
vf_ass: use correct height when copying image
The target image can be larger than the image size the video filter was configured for. Based on mplayer-svn commit 34973.
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_ass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 0eabc50bb3..f7e3e62ec0 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -290,7 +290,7 @@ static void copy_to_image(struct vf_instance *vf)
unsigned char *dst = vf->dmpi->planes[pl];
unsigned char *src = vf->priv->planes[pl];
unsigned char *src_next = vf->priv->planes[pl] + src_stride;
- for (i = 0; i < vf->dmpi->chroma_height; ++i) {
+ for (i = 0; i < vf->priv->outh / 2; ++i) {
for (j = vf->priv->line_limits[i].start; j < vf->priv->line_limits[i].end; j++) {
unsigned val = 0;
val += src[j << 1];