projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f6af8a
)
interleave: Work around changes in g_atomic API
author
David Schleef
<ds@schleef.org>
Sat, 4 Jun 2011 20:49:52 +0000
(13:49 -0700)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Wed, 15 Jun 2011 20:10:01 +0000
(21:10 +0100)
See #651514 for details.
gst/interleave/interleave.c
patch
|
blob
|
history
diff --git
a/gst/interleave/interleave.c
b/gst/interleave/interleave.c
index
96a43c8
..
f8e4392
100644
(file)
--- 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,