diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-04 15:38:09 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-04 15:38:09 +0000 |
| commit | a1daf846f3e65ab2b2d7d55dce033a400af462cb (patch) | |
| tree | 8070d7b4e6bf356e6d0cd2aadd49530eb4a120f8 /gst/gstsystemclock.c | |
| parent | 70df7c91890bc190b5437bdc5ea8551879f84b77 (diff) | |
| parent | 2666450864d8301e350f4c05eae4f5d25535c377 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst/gstobject.h
libs/gst/check/gstcheck.h
libs/gst/controller/gstcontroller.c
plugins/elements/gstidentity.c
tools/gst-xmlinspect.c
Diffstat (limited to 'gst/gstsystemclock.c')
| -rw-r--r-- | gst/gstsystemclock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index bc6ce3028..504cd015a 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -732,8 +732,14 @@ gst_system_clock_start_async (GstSystemClock * clock) if (G_LIKELY (clock->thread != NULL)) return TRUE; /* Thread already running. Nothing to do */ +#if !GLIB_CHECK_VERSION (2, 31, 0) clock->thread = g_thread_create ((GThreadFunc) gst_system_clock_async_thread, clock, TRUE, &error); +#else + clock->thread = g_thread_try_new ("GstSystemClock", + (GThreadFunc) gst_system_clock_async_thread, clock, &error); +#endif + if (G_UNLIKELY (error)) goto no_thread; |