diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2015-09-29 13:31:18 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-09-29 23:57:38 +0100 |
| commit | 484a410be0e3fa7a6d8ca63278df06531742e26d (patch) | |
| tree | b568ff4ea9fb36022adc5344a1b504fe93b0c675 | |
| parent | 5c1bb42045d6cbffa1e21089b2152cf633dd45e5 (diff) | |
| download | gstreamer-plugins-bad-484a410be0e3fa7a6d8ca63278df06531742e26d.tar.gz | |
videoaggregator: fix compilation with older glib version
Remove weird use of private gtype defines and fix compilation
with older glib versions such as 2.36.
https://bugzilla.gnome.org/show_bug.cgi?id=755754
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 09347c37d..ea1e8104a 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -438,25 +438,17 @@ static void gst_videoaggregator_init (GstVideoAggregator * self, GstVideoAggregatorClass * klass); static void gst_videoaggregator_class_init (GstVideoAggregatorClass * klass); static gpointer gst_videoaggregator_parent_class = NULL; -static gint GstVideoAggregator_private_offset; - -_G_DEFINE_TYPE_EXTENDED_CLASS_INIT (GstVideoAggregator, gst_videoaggregator); - -G_GNUC_UNUSED static inline gpointer -gst_videoaggregator_get_instance_private (const GstVideoAggregator * self) -{ - return (G_STRUCT_MEMBER_P (self, GstVideoAggregator_private_offset)); -} GType gst_videoaggregator_get_type (void) { static volatile gsize g_define_type_id_volatile = 0; + if (g_once_init_enter (&g_define_type_id_volatile)) { GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR, g_intern_static_string ("GstVideoAggregator"), sizeof (GstVideoAggregatorClass), - (GClassInitFunc) gst_videoaggregator_class_intern_init, + (GClassInitFunc) gst_videoaggregator_class_init, sizeof (GstVideoAggregator), (GInstanceInitFunc) gst_videoaggregator_init, (GTypeFlags) G_TYPE_FLAG_ABSTRACT); @@ -2079,6 +2071,8 @@ gst_videoaggregator_class_init (GstVideoAggregatorClass * klass) GST_DEBUG_CATEGORY_INIT (gst_videoaggregator_debug, "videoaggregator", 0, "base video aggregator"); + gst_videoaggregator_parent_class = g_type_class_peek_parent (klass); + g_type_class_add_private (klass, sizeof (GstVideoAggregatorPrivate)); gobject_class->finalize = gst_videoaggregator_finalize; |