diff options
author | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
commit | ef3ed344af7d0eb330f68c85d31acfa9471d1573 (patch) | |
tree | 012d45187cfa98f972073142ce341190252e17f7 /gst-libs/gst/video/videosink.h | |
parent | 70a4a0e00218745b2bf7ad0b145fe9a967981cb4 (diff) | |
download | gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.gz gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.bz2 gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.zip |
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Diffstat (limited to 'gst-libs/gst/video/videosink.h')
-rw-r--r-- | gst-libs/gst/video/videosink.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |