Ignore X11 errors on Maemo

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 10acaa1b3988b65cdd6363431bd3971e15725fcf..3560352414ce85b9ecc78ccfd3e9b59d3c45bc09 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -3009,8 +3009,13 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
         return i_shm_major = 0;
 #endif
 
+#ifndef HAVE_OSSO
     XSetErrorHandler(NULL);
     return (XSetErrorHandler(X11ErrorHandler))( display, event );
+#else
+    /* Work-around Maemo Xvideo bug */
+    return 0;
+#endif
 }
 
 #ifdef MODULE_NAME_IS_x11