[vlc-devel] commit: Support for older xcb-xv ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 23 15:45:56 2009 +0300| [f77bf7a10aa7b10a5e27701da137dcb29ae9f3bd] | committer: Rémi Denis-Courmont 

Support for older xcb-xv

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f77bf7a10aa7b10a5e27701da137dcb29ae9f3bd
---

 configure.ac                      |    5 +++++
 modules/video_output/xcb/xvideo.c |    4 ++++
 src/misc/linux_specific.c         |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9e04350..8603f46 100644
--- 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 f460c4a..11ea8b5 100644
--- 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 79c8807..322339b 100644
--- 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