From: Björn Axelsson <gecko@acc.umu.se>
Date: Mon, 9 Feb 2009 00:27:04 +0000 (+0000)
Subject: Fix blend_subrect for even-width subrects positioned on odd columns
X-Git-Tag: v0.5~687
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/f54b31b9ef1b3b4f6271ae7d58cbea398a4f5576?hp=ffe2c09d4658882e5debabb9ab59ce6b3c9b7591

Fix blend_subrect for even-width subrects positioned on odd columns

Patch by Björn Axelsson ( gecko A acc D umu D se )

Originally committed as revision 17088 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/ffplay.c b/ffplay.c
index 3a22c45..9367f64 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -449,7 +449,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
     cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
     cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 
-    width2 = (dstw + 1) >> 1;
+    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
     skip2 = dstx >> 1;
     wrap = dst->linesize[0];
     wrap3 = rect->pict.linesize[0];