mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: use GLib 2.22 API unconditionally

Browse source
This commit is contained in:
Tim-Philipp Müller 2010-12-04 14:45:58 +00:00
parent 740aab4f55
commit 78f33715ff
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -1198,9 +1198,8 @@ gst_discoverer_start (GstDiscoverer * discoverer)
discoverer->priv->async = TRUE; discoverer->priv->async = TRUE;
discoverer->priv->running = TRUE; discoverer->priv->running = TRUE;
#if GLIB_CHECK_VERSION(2, 22, 0)
ctx = g_main_context_get_thread_default (); ctx = g_main_context_get_thread_default ();
#endif
/* Connect to bus signals */ /* Connect to bus signals */
if (ctx == NULL) if (ctx == NULL)
ctx = g_main_context_default (); ctx = g_main_context_default ();

5
gst-libs/gst/tag/lang.c
View file

@ -51,11 +51,6 @@
#include "tag.h" #include "tag.h"
#include "lang-tables.dat" #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 #ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT ensure_debug_category() #define GST_CAT_DEFAULT ensure_debug_category()

4
gst-libs/gst/tag/mklangtables.c
View file

@ -30,10 +30,6 @@
#include <glib.h> #include <glib.h>
#include <string.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" #define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml"
typedef struct typedef struct

3
gst-libs/gst/video/convertframe.c
View file

@ -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 (GST_BUFFER_CAPS (buf) != NULL);
g_return_if_fail (callback != NULL); g_return_if_fail (callback != NULL);
#if GLIB_CHECK_VERSION(2,22,0)
context = g_main_context_get_thread_default (); context = g_main_context_get_thread_default ();
#endif
if (!context) if (!context)
context = g_main_context_default (); context = g_main_context_default ();