Commit f77bf7a1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Support for older xcb-xv

parent 812fd61f
...@@ -4090,6 +4090,11 @@ AS_IF([test "${enable_xcb}" != "no"], [ ...@@ -4090,6 +4090,11 @@ AS_IF([test "${enable_xcb}" != "no"], [
AS_IF([test "${enable_xvideo}" != "no"], [ AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
VLC_ADD_PLUGIN([xcb_xv]) 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])
])
]) ])
]) ])
......
...@@ -340,7 +340,11 @@ FindFormat (vout_thread_t *vout, vlc_fourcc_t chroma, xcb_xv_port_t port, ...@@ -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; xcb_connection_t *conn = vout->p_sys->conn;
const xcb_xv_image_format_info_t *f, *end; const xcb_xv_image_format_info_t *f, *end;
#ifndef XCB_XV_OLD
f = xcb_xv_list_image_formats_format (list); 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); end = f + xcb_xv_list_image_formats_format_length (list);
for (; f < end; f++) for (; f < end; f++)
{ {
......
...@@ -91,7 +91,7 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) ...@@ -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); "Please update to version 2.8 or newer.\n", stderr);
fflush (stderr); fflush (stderr);
#ifndef DISABLE_BUGGY_GLIBC_CHECK #ifndef DISABLE_BUGGY_GLIBC_CHECK
abort (); //abort ();
#endif #endif
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment