From ef3ed344af7d0eb330f68c85d31acfa9471d1573 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 18 Dec 2003 09:49:50 +0000 Subject: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3 Original commit message from CVS: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3 --- gst-libs/gst/video/videosink.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gst-libs/gst/video/videosink.h') diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h index 5e829b17..6ba23fd4 100644 --- a/gst-libs/gst/video/videosink.h +++ b/gst-libs/gst/video/videosink.h @@ -56,7 +56,7 @@ struct _GstVideoSink { GstClock *clock; - GST_OBJECT_PADDING + gpointer _gst_reserved[GST_PADDING]; }; struct _GstVideoSinkClass { @@ -65,7 +65,7 @@ struct _GstVideoSinkClass { /* signals */ void (*have_video_size) (GstVideoSink *element, gint width, gint height); - GST_CLASS_PADDING + gpointer _gst_reserved[GST_PADDING]; }; GType gst_videosink_get_type (void); -- cgit v1.2.1