playbin2: Don't hold the playbin lock in the autoplug-continue callback
It's not necessary there as the group lock already protects everything we access here and causes deadlocks in some cases. Fixes bug #673708.
This commit is contained in:
parent
c9ad084e29
commit
77db9a887c
@ -3179,7 +3179,6 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
|
|||||||
GstElement *sink;
|
GstElement *sink;
|
||||||
GstPad *sinkpad = NULL;
|
GstPad *sinkpad = NULL;
|
||||||
|
|
||||||
GST_PLAY_BIN_LOCK (group->playbin);
|
|
||||||
GST_SOURCE_GROUP_LOCK (group);
|
GST_SOURCE_GROUP_LOCK (group);
|
||||||
|
|
||||||
if ((sink = group->playbin->text_sink))
|
if ((sink = group->playbin->text_sink))
|
||||||
@ -3256,7 +3255,6 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
|
|||||||
|
|
||||||
done:
|
done:
|
||||||
GST_SOURCE_GROUP_UNLOCK (group);
|
GST_SOURCE_GROUP_UNLOCK (group);
|
||||||
GST_PLAY_BIN_UNLOCK (group->playbin);
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (group->playbin,
|
GST_DEBUG_OBJECT (group->playbin,
|
||||||
"continue autoplugging group %p for %s:%s, %" GST_PTR_FORMAT ": %d",
|
"continue autoplugging group %p for %s:%s, %" GST_PTR_FORMAT ": %d",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user