3 files changed, 7 insertions, 24 deletions

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 7a163773b..3db87f06b 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -9,4 +9,4 @@ libgstvideoinclude_HEADERS = video.h videosink.h
 
 libgstvideo_la_LIBADD =
 libgstvideo_la_CFLAGS = $(GST_CFLAGS)
-libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) ../../../../gstreamer2/gst/base/libgstbase.la
diff --git a/gst-libs/gst/video/gstvideosink.c b/gst-libs/gst/video/gstvideosink.c
index 1085ace95..2d06b3157 100644
--- a/gst-libs/gst/video/gstvideosink.c
+++ b/gst-libs/gst/video/gstvideosink.c
@@ -27,17 +27,6 @@
 
 static GstElementClass *parent_class = NULL;
 
-/* Private methods */
-
-static void
-gst_videosink_set_clock (GstElement * element, GstClock * clock)
-{
-  GstVideoSink *videosink;
-
-  videosink = GST_VIDEOSINK (element);
-
-  videosink->clock = clock;
-}
 
 /* Initing stuff */
 
@@ -46,7 +35,6 @@ gst_videosink_init (GstVideoSink * videosink)
 {
   videosink->width = 0;
   videosink->height = 0;
-  videosink->clock = NULL;
 }
 
 static void
@@ -59,8 +47,6 @@ gst_videosink_class_init (GstVideoSinkClass * klass)
   gstelement_class = (GstElementClass *) klass;
 
   parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
-
-  gstelement_class->set_clock = gst_videosink_set_clock;
 }
 
 /* Public methods */
@@ -83,7 +69,7 @@ gst_videosink_get_type (void)
       (GInstanceInitFunc) gst_videosink_init,
     };
 
-    videosink_type = g_type_register_static (GST_TYPE_ELEMENT,
+    videosink_type = g_type_register_static (GST_TYPE_BASESINK,
         "GstVideoSink", &videosink_info, 0);
   }
 
diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h
index d1e3aa975..dc7b2805c 100644
--- a/gst-libs/gst/video/videosink.h
+++ b/gst-libs/gst/video/videosink.h
@@ -23,6 +23,7 @@
 #define __GST_VIDEOSINK_H__
 
 #include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,28 +41,24 @@ extern "C" {
 #define GST_VIDEOSINK_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VIDEOSINK, GstVideoSinkClass))
   
-#define GST_VIDEOSINK_PAD(obj) (GST_VIDEOSINK (obj)->sinkpad)
+#define GST_VIDEOSINK_PAD GST_BASESINK_PAD
+#define GST_VIDEOSINK_CLOCK GST_BASESINK_CLOCK
 #define GST_VIDEOSINK_WIDTH(obj) (GST_VIDEOSINK (obj)->width)
 #define GST_VIDEOSINK_HEIGHT(obj) (GST_VIDEOSINK (obj)->height)
-#define GST_VIDEOSINK_CLOCK(obj) (GST_VIDEOSINK (obj)->clock)
   
 typedef struct _GstVideoSink GstVideoSink;
 typedef struct _GstVideoSinkClass GstVideoSinkClass;
 
 struct _GstVideoSink {
-  GstElement element;
-  
-  GstPad *sinkpad;
+  GstBaseSink element;
   
   gint width, height;
   
-  GstClock *clock;
-  
   gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstVideoSinkClass {
-  GstElementClass parent_class;
+  GstBaseSinkClass parent_class;
       
   gpointer _gst_reserved[GST_PADDING];
 };