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:
1494e4e
)
adder: Work around changes in g_atomic API
author
David Schleef
<ds@schleef.org>
Sat, 4 Jun 2011 20:36:55 +0000
(13:36 -0700)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Tue, 14 Jun 2011 13:13:16 +0000
(14:13 +0100)
See #651514 for details.
gst/adder/gstadder.c
patch
|
blob
|
history
diff --git
a/gst/adder/gstadder.c
b/gst/adder/gstadder.c
index
fca3eb2
..
1a93fe7
100644
(file)
--- a/
gst/adder/gstadder.c
+++ b/
gst/adder/gstadder.c
@@
-943,7
+943,11
@@
gst_adder_request_new_pad (GstElement * element, GstPadTemplate * templ,
adder = GST_ADDER (element);
/* increment pad counter */
+#if GLIB_CHECK_VERSION(2,29,5)
+ padcount = g_atomic_int_add (&adder->padcount, 1);
+#else
padcount = g_atomic_int_exchange_and_add (&adder->padcount, 1);
+#endif
name = g_strdup_printf ("sink%d", padcount);
newpad = gst_pad_new_from_template (templ, name);