From f54b31b9ef1b3b4f6271ae7d58cbea398a4f5576 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Axelsson?= <gecko@acc.umu.se>
Date: Mon, 9 Feb 2009 00:27:04 +0000
Subject: [PATCH] Fix blend_subrect for even-width subrects positioned on odd
 columns
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

Originally committed as revision 17088 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffplay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffplay.c b/ffplay.c
index 3a22c45a4..9367f6410 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];
-- 
2.34.1