From bf2452d776899a197239cb6e10882f2978b9ae0c Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Sat, 20 Oct 2012 12:54:06 +0100
Subject: g_type_init() is no longer required and deprecated in glib >= 2.35.0

https://bugzilla.gnome.org/show_bug.cgi?id=686456
---
 gst/gst.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gst/gst.c')

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 ();
-- 
cgit v1.2.3