[vlc-commits] Require "complete" enough libxcb-xv

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 20 17:56:50 2011 +0200| [0aa7bd8a638164aaf5f4f6acde256e15521d54f0] | committer: Rémi Denis-Courmont

Require "complete" enough libxcb-xv

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

 configure.ac                      |    5 -----
 modules/video_output/xcb/xvideo.c |    4 ----
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 12f297a..0265408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3187,11 +3187,6 @@ 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 692a25b..7428cb9 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -247,11 +247,7 @@ FindFormat (vout_display_t *vd,
     xcb_connection_t *conn = vd->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++)
     {