From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 16 Apr 2009 18:00:22 +0000 (+0300)
Subject: Mimic X11 plugin picture allocation
X-Git-Tag: 1.0.0-pre2~14
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=38c3b44d255c1e1fd974e290fdad36f711dc0087;p=vlc

Mimic X11 plugin picture allocation

(It still crashes on resize nevertheless)
---

diff --git a/modules/video_output/xcb/xcb.c b/modules/video_output/xcb/xcb.c
index 99520d99b5..b4d9a0faf7 100644
--- a/modules/video_output/xcb/xcb.c
+++ b/modules/video_output/xcb/xcb.c
@@ -484,15 +484,19 @@ static int Init (vout_thread_t *vout)
     xcb_flush (p_sys->conn);
 
     /* Allocate picture buffers */
-    do
+    I_OUTPUTPICTURES = 0;
+    for (size_t index = 0; I_OUTPUTPICTURES < 2; index++)
     {
-        picture_t *pic = vout->p_picture + I_OUTPUTPICTURES;
+        picture_t *pic = vout->p_picture + index;
 
+        if (index > sizeof (vout->p_picture) / sizeof (pic))
+            break;
+        if (pic->i_status != FREE_PICTURE)
+            continue;
         if (PictureInit (vout, pic))
             break;
         PP_OUTPUTPICTURE[I_OUTPUTPICTURES++] = pic;
     }
-    while (I_OUTPUTPICTURES < 2);
 
     return VLC_SUCCESS;