Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / tools / gst-discoverer.c

diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c
index 5b2a74b..c29045d 100644 (file)
--- a/tools/gst-discoverer.c
+++ b/tools/gst-discoverer.c
@@ -499,8 +499,10 @@ main (int argc, char **argv)
   };
   GOptionContext *ctx;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx =
       g_option_context_new