summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-03-26 11:42:45 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-03-26 11:42:45 +0100
commita9f931c467d40afc18a947240cc6875ad7e41c5c (patch)
tree509fc83f47e3c26fc696868f54b8c6032694a4e1 /gst
parent7ff9bdb45659fdfbc434a202c0588c6a271bef0a (diff)
downloadgst-plugins-bad-a9f931c467d40afc18a947240cc6875ad7e41c5c.tar.gz
gst-plugins-bad-a9f931c467d40afc18a947240cc6875ad7e41c5c.tar.bz2
gst-plugins-bad-a9f931c467d40afc18a947240cc6875ad7e41c5c.zip
mxf: Remove some GLib < 2.14 compatibility stuff
Diffstat (limited to 'gst')
-rw-r--r--gst/mxf/mxfmetadata.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/gst/mxf/mxfmetadata.c b/gst/mxf/mxfmetadata.c
index 07c18b0f..0aff0317 100644
--- a/gst/mxf/mxfmetadata.c
+++ b/gst/mxf/mxfmetadata.c
@@ -6962,17 +6962,11 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type,
return ret;
}
-/* TODO: Remove this once we depend on GLib 2.14 */
-#if GLIB_CHECK_VERSION (2, 14, 0)
-#define __gst_once_init_enter(val) (g_once_init_enter (val))
-#define __gst_once_init_leave(val,newval) (g_once_init_leave (val, newval))
-#endif
-
GType
mxf_descriptive_metadata_framework_get_type (void)
{
static volatile gsize type = 0;
- if (__gst_once_init_enter (&type)) {
+ if (g_once_init_enter (&type)) {
GType _type = 0;
static const GTypeInfo info = {
sizeof (MXFDescriptiveMetadataFrameworkInterface),
@@ -6990,7 +6984,7 @@ mxf_descriptive_metadata_framework_get_type (void)
g_type_interface_add_prerequisite (_type, MXF_TYPE_DESCRIPTIVE_METADATA);
- __gst_once_init_leave (&type, (gsize) _type);
+ g_once_init_leave (&type, (gsize) _type);
}
return (GType) type;