projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db1318a
)
basetransform: small cleanups
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 16 Mar 2012 21:25:38 +0000
(22:25 +0100)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 16 Mar 2012 21:25:38 +0000
(22:25 +0100)
libs/gst/base/gstbasetransform.c
patch
|
blob
|
history
diff --git
a/libs/gst/base/gstbasetransform.c
b/libs/gst/base/gstbasetransform.c
index
d71fe5d
..
14313cc
100644
(file)
--- 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 set
caps */
+ /*
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;