[SCM] libav/experimental: Fix blend_subrect for some subrects positioned on odd rows.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4606a05979f48aea4cef5125cb885405c9903eee
Author: Björn Axelsson <gecko at acc.umu.se>
Date:   Thu Feb 5 23:10:05 2009 +0000

    Fix blend_subrect for some subrects positioned on odd rows.
    
    Patch by Björn Axelsson gecko A acc D umu D se
    
    Originally committed as revision 17014 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index ad98f0a..946f4cd 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -498,8 +498,8 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
             p++;
             lum++;
         }
-        p += wrap3 + (wrap3 - dstw * BPP);
-        lum += wrap + (wrap - dstw - dstx);
+        p += wrap3 - dstw * BPP;
+        lum += wrap - dstw - dstx;
         cb += dst->linesize[1] - width2 - skip2;
         cr += dst->linesize[2] - width2 - skip2;
     }

-- 
Libav/FFmpeg packaging