summaryrefslogtreecommitdiff
path: root/sys/vdpau/Makefile.am
diff options
context:
space:
mode:
authorCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2010-03-17 20:59:08 +0100
committerCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2010-05-01 14:46:11 +0200
commitc4f60760edd70b9cd502f6ceca1d076a4e81b36c (patch)
tree019fc3b3fbde7fb01274fdf9fa918960c6c571ab /sys/vdpau/Makefile.am
parentff7381109ff9f99f714d2b333dcaf906f58fa12c (diff)
downloadgstreamer-plugins-bad-c4f60760edd70b9cd502f6ceca1d076a4e81b36c.tar.gz
vdpau: add better error handling to GstVdpOutputSrcPad
gst_vdp_output_src_pad_push, gst_vdp_output_src_pad_alloc_buffer and gst_vdp_output_src_pad_get_device now take a GError parameter to be able to signal errors to the caller
Diffstat (limited to 'sys/vdpau/Makefile.am')
-rw-r--r--sys/vdpau/Makefile.am15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am
index 4332d6ee1..98c874ad9 100644
--- a/sys/vdpau/Makefile.am
+++ b/sys/vdpau/Makefile.am
@@ -3,8 +3,7 @@ plugin_LTLIBRARIES = libgstvdpau.la
libgstvdpau_la_SOURCES = \
gstvdpmpegdec.c \
mpegutil.c \
- gstvdp.c \
- gstvdputils.c \
+ gstvdpau.c \
gstvdpvideopostprocess.c \
gstvdpsink.c
@@ -26,10 +25,12 @@ lib_LTLIBRARIES = libgstvdp-@GST_MAJORMINOR@.la
libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \
gstvdpdevice.c \
+ gstvdputils.c \
gstvdpvideobuffer.c \
gstvdpoutputbuffer.c \
gstvdpvideosrcpad.c \
- gstvdpoutputsrcpad.c
+ gstvdpoutputsrcpad.c \
+ gstvdp.c
libgstvdp_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vdpau
libgstvdp_@GST_MAJORMINOR@include_HEADERS = \
@@ -39,8 +40,12 @@ libgstvdp_@GST_MAJORMINOR@include_HEADERS = \
gstvdpvideosrcpad.h \
gstvdpoutputsrcpad.h
-libgstvdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS)
-libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(VDPAU_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR)
+libgstvdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS)
+
+libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \
+ -lgstvideo-$(GST_MAJORMINOR)
+
libgstvdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS)
libgstvdp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static