From 5c97aa2e5cbd74ba960cc9bc2e1c3d7ae92d51b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 2 Jun 2011 11:53:10 +0200 Subject: [PATCH] playsink: Fix deadlock in the audio/video converter bins when linking fails --- gst/playback/gstplaysinkaudioconvert.c | 2 ++ gst/playback/gstplaysinkvideoconvert.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gst/playback/gstplaysinkaudioconvert.c b/gst/playback/gstplaysinkaudioconvert.c index a179e73075..a10ab96455 100644 --- a/gst/playback/gstplaysinkaudioconvert.c +++ b/gst/playback/gstplaysinkaudioconvert.c @@ -248,6 +248,8 @@ link_failed: gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GDestroyNotify) gst_object_unref); + + GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self); return; } } diff --git a/gst/playback/gstplaysinkvideoconvert.c b/gst/playback/gstplaysinkvideoconvert.c index 692da0febe..dc87e5f275 100644 --- a/gst/playback/gstplaysinkvideoconvert.c +++ b/gst/playback/gstplaysinkvideoconvert.c @@ -228,6 +228,8 @@ link_failed: gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GDestroyNotify) gst_object_unref); + + GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self); return; } }