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/videobox | |
| parent | 768e3826abb88f8c4134a429f3dc34eb72df8a15 (diff) | |
controller: port to new controller location and api
Diffstat (limited to 'gst/videobox')
| -rw-r--r-- | gst/videobox/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/videobox/gstvideobox.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/gst/videobox/Makefile.am b/gst/videobox/Makefile.am index 90dcd4b8f..21f04a079 100644 --- a/gst/videobox/Makefile.am +++ b/gst/videobox/Makefile.am @@ -6,12 +6,10 @@ include $(top_srcdir)/common/orc.mak libgstvideobox_la_SOURCES = gstvideobox.c nodist_libgstvideobox_la_SOURCES = $(ORC_NODIST_SOURCES) libgstvideobox_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CONTROLLER_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ $(ORC_CFLAGS) libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - $(GST_CONTROLLER_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) \ diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c index f9854882f..2294d262f 100644 --- a/gst/videobox/gstvideobox.c +++ b/gst/videobox/gstvideobox.c @@ -64,8 +64,6 @@ #include <math.h> #include <string.h> -#include <gst/controller/gstcontroller.h> - GST_DEBUG_CATEGORY_STATIC (videobox_debug); #define GST_CAT_DEFAULT videobox_debug @@ -3365,7 +3363,7 @@ gst_video_box_before_transform (GstBaseTransform * trans, GstBuffer * in) GST_TIME_ARGS (timestamp)); if (GST_CLOCK_TIME_IS_VALID (stream_time)) - gst_object_sync_values (G_OBJECT (video_box), stream_time); + gst_object_sync_values (GST_OBJECT (video_box), stream_time); } static GstFlowReturn @@ -3389,8 +3387,6 @@ gst_video_box_transform (GstBaseTransform * trans, GstBuffer * in, static gboolean plugin_init (GstPlugin * plugin) { - gst_controller_init (NULL, NULL); - GST_DEBUG_CATEGORY_INIT (videobox_debug, "videobox", 0, "Resizes a video by adding borders or cropping"); |