Commit 78f33715 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

libs: use GLib 2.22 API unconditionally

parent 740aab4f
......@@ -1198,9 +1198,8 @@ gst_discoverer_start (GstDiscoverer * discoverer)
discoverer->priv->async = TRUE;
discoverer->priv->running = TRUE;
#if GLIB_CHECK_VERSION(2, 22, 0)
ctx = g_main_context_get_thread_default ();
#endif
/* Connect to bus signals */
if (ctx == NULL)
ctx = g_main_context_default ();
......
......@@ -51,11 +51,6 @@
#include "tag.h"
#include "lang-tables.dat"
/* FIXME: remove once we depend on GLib >= 2.22 */
#if !GLIB_CHECK_VERSION (2, 22, 0)
#define g_mapped_file_unref g_mapped_file_free
#endif
#ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT ensure_debug_category()
......
......@@ -30,10 +30,6 @@
#include <glib.h>
#include <string.h>
#if !GLIB_CHECK_VERSION (2, 22, 0)
#define g_mapped_file_unref g_mapped_file_free
#endif
#define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml"
typedef struct
......
......@@ -615,9 +615,8 @@ gst_video_convert_frame_async (GstBuffer * buf, const GstCaps * to_caps,
g_return_if_fail (GST_BUFFER_CAPS (buf) != NULL);
g_return_if_fail (callback != NULL);
#if GLIB_CHECK_VERSION(2,22,0)
context = g_main_context_get_thread_default ();
#endif
if (!context)
context = g_main_context_default ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment