Support for older xcb-xv

diff --git a/configure.ac b/configure.ac
index 9e043504a61efe7dbf386336ee914aef072a7853..8603f46c58f8a63541261acac075fda34627f80a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4090,6 +4090,11 @@ AS_IF([test "${enable_xcb}" != "no"], [
   AS_IF([test "${enable_xvideo}" != "no"], [
     PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
       VLC_ADD_PLUGIN([xcb_xv])
+    ], [
+      PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [
+        VLC_ADD_PLUGIN([xcb_xv])
+        VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD])
+      ])
     ])
   ])
 

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index f460c4afad8f3cd2ebd0c42e30e3634ef417d269..11ea8b586957ce0cc2ed3a4999995e96db8c1895 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -340,7 +340,11 @@ FindFormat (vout_thread_t *vout, vlc_fourcc_t chroma, xcb_xv_port_t port,
     xcb_connection_t *conn = vout->p_sys->conn;
     const xcb_xv_image_format_info_t *f, *end;
 
+#ifndef XCB_XV_OLD
     f = xcb_xv_list_image_formats_format (list);
+#else
+    f = (xcb_xv_image_format_info_t *) (list + 1);
+#endif
     end = f + xcb_xv_list_image_formats_format_length (list);
     for (; f < end; f++)
     {

diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c
index 79c880742b1dc4635f68a2899541e5b379cf5109..322339b52ad80412c2ca3c463a8309161b98f6c4 100644 (file)
--- a/src/misc/linux_specific.c
+++ b/src/misc/linux_specific.c
@@ -91,7 +91,7 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
                "Please update to version 2.8 or newer.\n", stderr);
         fflush (stderr);
 #ifndef DISABLE_BUGGY_GLIBC_CHECK
-        abort ();
+        //abort ();
 #endif
     }
 #endif