From fc3b43ef626d06244716797427b9a642daf0998b Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 4 Jun 2011 13:49:52 -0700 Subject: [PATCH] interleave: Work around changes in g_atomic API See #651514 for details. --- gst/interleave/interleave.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c index 96a43c8..f8e4392 100644 --- a/gst/interleave/interleave.c +++ b/gst/interleave/interleave.c @@ -479,8 +479,13 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ, if (templ->direction != GST_PAD_SINK) goto not_sink_pad; +#if GLIB_CHECK_VERSION(2,29,5) + channels = g_atomic_int_add (&self->channels, 1); + padnumber = g_atomic_int_add (&self->padcounter, 1); +#else channels = g_atomic_int_exchange_and_add (&self->channels, 1); padnumber = g_atomic_int_exchange_and_add (&self->padcounter, 1); +#endif pad_name = g_strdup_printf ("sink%d", padnumber); new_pad = GST_PAD_CAST (g_object_new (GST_TYPE_INTERLEAVE_PAD, -- 2.7.4