From a4f664639acceb32abfcbd49b62bb5a664c05f02 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 20 Jan 2010 02:40:29 +0000 Subject: Use pkg-config for vdpau where possible; fix excessive libvdpau linkage. --- src/video_dec/libvdpau/Makefile.am | 2 +- src/video_out/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/video_dec/libvdpau/Makefile.am b/src/video_dec/libvdpau/Makefile.am index f2a6e5176..f3ffbcccf 100644 --- a/src/video_dec/libvdpau/Makefile.am +++ b/src/video_dec/libvdpau/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = bits_reader.h dpb.h cpb.h h264_parser.h nal.h if ENABLE_VDPAU vdpau_h264_module = xineplug_decode_vdpau_h264.la -VDPAU_CFLAGS = -D_ISOC99_SOURCE +VDPAU_CFLAGS += -D_ISOC99_SOURCE vdpau_mpeg12_module = xineplug_decode_vdpau_mpeg12.la diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index d44021faf..7b9c3eeda 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -118,8 +118,8 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ xineplug_vo_out_none.la xineplug_vo_out_vdpau_la_SOURCES = video_out_vdpau.c -xineplug_vo_out_vdpau_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(MLIB_LIBS) $(PTHREAD_LIBS) $(X_LIBS) $(LTLIBINTL) -lvdpau -xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) +xineplug_vo_out_vdpau_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(MLIB_LIBS) $(PTHREAD_LIBS) $(X_LIBS) $(LTLIBINTL) $(VDPAU_LIBS) +xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) $(VDPAU_CFLAGS) xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS) -- cgit v1.2.3