[vlc-commits] vdpau: video output requires XCB (fixes #14408)

Rémi Denis-Courmont git at videolan.org
Thu Apr 16 20:00:53 CEST 2015


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr 16 20:58:52 2015 +0300| [55574f4261cac5260bd316d024fbf142d4ad3252] | committer: Rémi Denis-Courmont

vdpau: video output requires XCB (fixes #14408)

(cherry picked from commit c354efa3a2843d479c8fa9e929ff1064e5526bfa)

Conflicts:
	modules/hw/vdpau/Makefile.am

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

 modules/hw/vdpau/Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 731eb3d..4d112e7 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -51,4 +51,6 @@ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
 libvdpau_display_plugin_la_LIBADD = libvlc_vdpau.la \
 	../../video_output/libvlc_xcb_events.la \
 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
+if HAVE_XCB
 vdpau_LTLIBRARIES += libvdpau_display_plugin.la
+endif



More information about the vlc-commits mailing list