xvimagesink: Fallback to non-XShm mode if allocating the XShm image failed

Fixes bug #630456.

diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
index 0ef4b06c5029df77e6bebb7a625c27371c5c5f8c..2fac09a231a60d7d7071a6249a36d71228f61d8a 100644 (file)
--- a/sys/ximage/ximageutil.c
+++ b/sys/ximage/ximageutil.c
@@ -395,7 +395,13 @@ gst_ximageutil_ximage_new (GstXContext * xcontext,
         xcontext->visual, xcontext->depth,
         ZPixmap, NULL, &ximage->SHMInfo, ximage->width, ximage->height);
     if (!ximage->ximage) {
-      goto beach;
+      GST_WARNING_OBJECT (parent,
+          "could not XShmCreateImage a %dx%d image",
+          ximage->width, ximage->height);
+
+      /* Retry without XShm */
+      xcontext->use_xshm = FALSE;
+      goto no_xshm;
     }
 
     /* we have to use the returned bytes_per_line for our shm size */
@@ -421,6 +427,7 @@ gst_ximageutil_ximage_new (GstXContext * xcontext,
 
     XSync (xcontext->disp, FALSE);
   } else
+  no_xshm:
 #endif /* HAVE_XSHM */
   {
     ximage->ximage = XCreateImage (xcontext->disp,