mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: fix compilation with older glib version

Browse source 
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
This commit is contained in:
Tim-Philipp Müller 2015-09-29 13:31:18 +01:00
parent 6bc00355b8
commit 5409017642
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -438,25 +438,17 @@ static void gst_videoaggregator_init (GstVideoAggregator * self,
GstVideoAggregatorClass * klass); GstVideoAggregatorClass * klass);
static void gst_videoaggregator_class_init (GstVideoAggregatorClass * klass); static void gst_videoaggregator_class_init (GstVideoAggregatorClass * klass);
static gpointer gst_videoaggregator_parent_class = NULL; 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 GType
gst_videoaggregator_get_type (void) gst_videoaggregator_get_type (void)
{ {
static volatile gsize g_define_type_id_volatile = 0; static volatile gsize g_define_type_id_volatile = 0;
if (g_once_init_enter (&g_define_type_id_volatile)) { if (g_once_init_enter (&g_define_type_id_volatile)) {
GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR, GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR,
g_intern_static_string ("GstVideoAggregator"), g_intern_static_string ("GstVideoAggregator"),
sizeof (GstVideoAggregatorClass), sizeof (GstVideoAggregatorClass),
(GClassInitFunc) gst_videoaggregator_class_intern_init, (GClassInitFunc) gst_videoaggregator_class_init,
sizeof (GstVideoAggregator), sizeof (GstVideoAggregator),
(GInstanceInitFunc) gst_videoaggregator_init, (GInstanceInitFunc) gst_videoaggregator_init,
(GTypeFlags) G_TYPE_FLAG_ABSTRACT); (GTypeFlags) G_TYPE_FLAG_ABSTRACT);
@ -2079,6 +2071,8 @@ gst_videoaggregator_class_init (GstVideoAggregatorClass * klass)
GST_DEBUG_CATEGORY_INIT (gst_videoaggregator_debug, "videoaggregator", 0, GST_DEBUG_CATEGORY_INIT (gst_videoaggregator_debug, "videoaggregator", 0,
"base video aggregator"); "base video aggregator");
gst_videoaggregator_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (GstVideoAggregatorPrivate)); g_type_class_add_private (klass, sizeof (GstVideoAggregatorPrivate));
gobject_class->finalize = gst_videoaggregator_finalize; gobject_class->finalize = gst_videoaggregator_finalize;