mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 00:06:36 +00:00
capsfilter: Fix deadlock, gst_pad_get_current_caps() already takes the pad's object lock
This commit is contained in:
parent
fa28e2c5e6
commit
07c5caac50
1 changed files with 0 additions and 2 deletions
|
@ -168,7 +168,6 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
|
|||
GST_DEBUG_OBJECT (capsfilter, "set new caps %" GST_PTR_FORMAT, new_caps);
|
||||
|
||||
/* filter the currently negotiated format against the new caps */
|
||||
GST_OBJECT_LOCK (GST_BASE_TRANSFORM_SINK_PAD (object));
|
||||
nego = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SINK_PAD (object));
|
||||
if (nego) {
|
||||
GST_DEBUG_OBJECT (capsfilter, "we had negotiated caps %" GST_PTR_FORMAT,
|
||||
|
@ -205,7 +204,6 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
|
|||
* caps */
|
||||
suggest = NULL;
|
||||
}
|
||||
GST_OBJECT_UNLOCK (GST_BASE_TRANSFORM_SINK_PAD (object));
|
||||
|
||||
GST_DEBUG_OBJECT (capsfilter, "suggesting new caps %" GST_PTR_FORMAT,
|
||||
suggest);
|
||||
|
|
Loading…
Reference in a new issue