XCB-XVideo: pad picture height like VLC core

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 36df393ad76c9cd7eaac422492cc9c67944fe33e..09b2502d5b129c2f0374a134b19e59920f7f6478 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -254,14 +254,15 @@ FindFormat (vout_display_t *vd,
 
         /* VLC pads scanline to 16 pixels internally */
         unsigned width = (fmt->i_width + 15) & ~15;
+        unsigned height = (fmt->i_height + 15) & ~15;
         xcb_xv_query_image_attributes_reply_t *i;
         i = xcb_xv_query_image_attributes_reply (conn,
             xcb_xv_query_image_attributes (conn, port, f->id,
-                width, fmt->i_height), NULL);
+                                           width, height), NULL);
         if (i == NULL)
             continue;
 
-        if (i->width != width || i->height != fmt->i_height)
+        if (i->width != width || i->height != height)
         {
             msg_Warn (vd, "incompatible size %ux%u -> %"PRIu32"x%"PRIu32,
                       fmt->i_width, fmt->i_height,