[vlc-commits] picture: copy more than the visible lines

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jun  5 13:16:15 2018 +0200| [fb0590a2193faf851f374882521156df4f1e3d18] | committer: Jean-Baptiste Kempf

picture: copy more than the visible lines

When there is a vertical offset the visible lines for each plane don't contain
the extra lines. So we may not copy enough from the source. Until this is fixed
we need to copy as many lines as possible.

Fixes #20560

(cherry picked from commit 4594dedf117e40a1ba783ef55df995e12ea8e5fe)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fb0590a2193faf851f374882521156df4f1e3d18
---

 src/misc/picture.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/misc/picture.c b/src/misc/picture.c
index b7eecb4486..9a08255e16 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -323,8 +323,7 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
 {
     const unsigned i_width  = __MIN( p_dst->i_visible_pitch,
                                      p_src->i_visible_pitch );
-    const unsigned i_height = __MIN( p_dst->i_visible_lines,
-                                     p_src->i_visible_lines );
+    const unsigned i_height = __MIN( p_dst->i_lines, p_src->i_lines );
 
     /* The 2x visible pitch check does two things:
        1) Makes field plane_t's work correctly (see the deinterlacer module)