summaryrefslogtreecommitdiff
path: root/gst/gst.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2012-10-20 12:54:06 +0100
committerTim-Philipp Müller <tim@centricular.net>2012-10-20 12:56:30 +0100
commitbf2452d776899a197239cb6e10882f2978b9ae0c (patch)
treea4a7a7d18623b2ce0334a9922ed02f6e8964ecc3 /gst/gst.c
parent017b34079e6f60a7aa54873a6c1aa610dce3a287 (diff)
g_type_init() is no longer required and deprecated in glib >= 2.35.0
https://bugzilla.gnome.org/show_bug.cgi?id=686456
Diffstat (limited to 'gst/gst.c')
-rw-r--r--gst/gst.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/gst.c b/gst/gst.c
index 1be9773f0..c58e10166 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -545,8 +545,9 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
GST_DEBUG ("already initialized");
return TRUE;
}
-
+#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init ();
+#endif
#ifndef GST_DISABLE_GST_DEBUG
_priv_gst_debug_init ();