diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2011-11-04 18:41:36 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2011-11-04 20:15:48 +0100 |
| commit | fb162c8eb45416b39be650d280167835817e780b (patch) | |
| tree | 153493e465502e1749a6a44728aab8bd3be36ec5 /gst/alpha | |
| parent | 768e3826abb88f8c4134a429f3dc34eb72df8a15 (diff) | |
| download | gstreamer-plugins-good-fb162c8eb45416b39be650d280167835817e780b.tar.gz | |
controller: port to new controller location and api
Diffstat (limited to 'gst/alpha')
| -rw-r--r-- | gst/alpha/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/alpha/gstalpha.c | 4 | ||||
| -rw-r--r-- | gst/alpha/gstalpha.h | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am index dcd88ae04..b17fb41b1 100644 --- a/gst/alpha/Makefile.am +++ b/gst/alpha/Makefile.am @@ -2,9 +2,9 @@ plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la libgstalpha_la_SOURCES = gstalpha.c libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CONTROLLER_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) + $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - $(GST_CONTROLLER_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) + $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index 3b6ce3ae9..0edaf6d2b 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -2570,7 +2570,7 @@ gst_alpha_before_transform (GstBaseTransform * btrans, GstBuffer * buf) GST_BUFFER_TIMESTAMP (buf)); GST_LOG ("Got stream time of %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp)); if (GST_CLOCK_TIME_IS_VALID (timestamp)) - gst_object_sync_values (G_OBJECT (alpha), timestamp); + gst_object_sync_values (GST_OBJECT (alpha), timestamp); } static GstFlowReturn @@ -2624,8 +2624,6 @@ invalid_out: static gboolean plugin_init (GstPlugin * plugin) { - gst_controller_init (NULL, NULL); - return gst_element_register (plugin, "alpha", GST_RANK_NONE, GST_TYPE_ALPHA); } diff --git a/gst/alpha/gstalpha.h b/gst/alpha/gstalpha.h index 6cae928ca..3e15c14a9 100644 --- a/gst/alpha/gstalpha.h +++ b/gst/alpha/gstalpha.h @@ -26,7 +26,6 @@ #include <gst/gst.h> #include <gst/video/video.h> #include <gst/video/gstvideofilter.h> -#include <gst/controller/gstcontroller.h> G_BEGIN_DECLS |