diff options
author | Marc Leeman <marc.leeman@gmail.com> | 2013-02-07 11:54:06 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2013-02-09 18:35:33 +0000 |
commit | f7b16f6185ce90db48b9604fafa3e40f4d440ec7 (patch) | |
tree | 7896ac136654202efdc8cede027eda09d0b8afb2 /gst/coloreffects | |
parent | be07743a9e1794455f41b69c0d231d366e89f922 (diff) |
chromahold: deprecated GStaticMutex -> GMutex
https://bugzilla.gnome.org/show_bug.cgi?id=693322
Diffstat (limited to 'gst/coloreffects')
-rw-r--r-- | gst/coloreffects/gstchromahold.c | 8 | ||||
-rw-r--r-- | gst/coloreffects/gstchromahold.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gst/coloreffects/gstchromahold.c b/gst/coloreffects/gstchromahold.c index 4520e9c51..e13984bf7 100644 --- a/gst/coloreffects/gstchromahold.c +++ b/gst/coloreffects/gstchromahold.c @@ -86,14 +86,14 @@ GST_STATIC_PAD_TEMPLATE ("sink", #define GST_CHROMA_HOLD_LOCK(self) G_STMT_START { \ GST_LOG_OBJECT (self, "Locking chromahold from thread %p", g_thread_self ()); \ - g_static_mutex_lock (&self->lock); \ + g_mutex_lock (&self->lock); \ GST_LOG_OBJECT (self, "Locked chromahold from thread %p", g_thread_self ()); \ } G_STMT_END #define GST_CHROMA_HOLD_UNLOCK(self) G_STMT_START { \ GST_LOG_OBJECT (self, "Unlocking chromahold from thread %p", \ g_thread_self ()); \ - g_static_mutex_unlock (&self->lock); \ + g_mutex_unlock (&self->lock); \ } G_STMT_END static gboolean gst_chroma_hold_start (GstBaseTransform * trans); @@ -176,7 +176,7 @@ gst_chroma_hold_init (GstChromaHold * self) self->target_b = DEFAULT_TARGET_B; self->tolerance = DEFAULT_TOLERANCE; - g_static_mutex_init (&self->lock); + g_mutex_init (&self->lock); } static void @@ -184,7 +184,7 @@ gst_chroma_hold_finalize (GObject * object) { GstChromaHold *self = GST_CHROMA_HOLD (object); - g_static_mutex_free (&self->lock); + g_mutex_clear (&self->lock); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/gst/coloreffects/gstchromahold.h b/gst/coloreffects/gstchromahold.h index 14b10ddb7..ebe74a2c6 100644 --- a/gst/coloreffects/gstchromahold.h +++ b/gst/coloreffects/gstchromahold.h @@ -50,7 +50,7 @@ struct _GstChromaHold /* <private> */ /* caps */ - GStaticMutex lock; + GMutex lock; GstVideoFormat format; gint width, height; |