From f9c4b70a9860793b62b6f9ceefb0a12b0812434a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 16 Mar 2012 22:25:38 +0100 Subject: [PATCH] basetransform: small cleanups --- libs/gst/base/gstbasetransform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index d71fe5d..14313cc 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -959,8 +959,6 @@ gst_base_transform_configure_caps (GstBaseTransform * trans, GstCaps * in, ret = klass->set_caps (trans, in, out); } - trans->negotiated = ret; - return ret; } @@ -1274,7 +1272,7 @@ gst_base_transform_setcaps (GstBaseTransform * trans, GstPad * pad, trans->priv->reconfigure = FALSE; GST_OBJECT_UNLOCK (trans->sinkpad); - /* we know this will work, we implement the setcaps */ + /* let downstream know about our caps */ gst_pad_push_event (trans->srcpad, gst_event_new_caps (outcaps)); if (ret) { @@ -1286,7 +1284,9 @@ done: if (outcaps) gst_caps_unref (outcaps); + GST_OBJECT_LOCK (trans); trans->negotiated = ret; + GST_OBJECT_UNLOCK (trans); return ret; -- 2.7.4