xserver: Branch 'master'

[Keith Packard]

 glamor/glamor_xv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d723928870eea9fc2554abe137d6e57f7ad29e98
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 27 09:11:33 2014 -0800

    glamor: Fix nlines in glamor_xv_put_image when src_y is odd
    
    The number of lines of video to update in the texture needs to be
    computed from the height of the updated source, not the full height of
    the source.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 1c877da..83e24ad 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -435,7 +435,7 @@ glamor_xv_put_image(glamor_port_private *port_priv,
     }
 
     top = (src_y) & ~1;
-    nlines = (src_y + height) - top;
+    nlines = (src_y + src_h) - top;
 
     switch (id) {
     case FOURCC_YV12: