diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:58:23 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:58:23 +0000 |
| commit | a5d8b514c5895a5b72336545ce0b0dacd460ad9e (patch) | |
| tree | 2e3c287111932883fa349c9c7bd9ab96a6ca5aa2 /gst/alpha | |
| parent | d9568ba3550f9415482d3226b65f48ebd8bffb08 (diff) | |
No need to take the lock anymore, core already did that before calling us.
Original commit message from CVS:
* ext/mad/gstmad.c: (gst_mad_chain), (gst_mad_change_state):
* ext/sidplay/gstsiddec.cc:
* gst/alpha/gstalpha.c: (gst_alpha_chain):
* gst/goom/gstgoom.c: (gst_goom_chain):
No need to take the lock anymore, core already did
that before calling us.
Diffstat (limited to 'gst/alpha')
| -rw-r--r-- | gst/alpha/gstalpha.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index b052d5b2..a7573a5f 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -798,13 +798,11 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer) alpha = GST_ALPHA (GST_PAD_PARENT (pad)); - GST_STREAM_LOCK (pad); - new_width = alpha->in_width; new_height = alpha->in_height; if (new_width != alpha->out_width || - new_height != alpha->out_height || !GST_RPAD_CAPS (alpha->srcpad)) { + new_height != alpha->out_height || !GST_PAD_CAPS (alpha->srcpad)) { GstCaps *newcaps; newcaps = gst_caps_copy (gst_pad_get_negotiated_caps (alpha->sinkpad)); @@ -821,7 +819,7 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer) outbuf = gst_buffer_new_and_alloc (ROUND_UP_2 (new_width) * ROUND_UP_2 (new_height) * 4); - gst_buffer_set_caps (outbuf, GST_RPAD_CAPS (alpha->srcpad)); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (alpha->srcpad)); GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buffer); GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buffer); @@ -854,8 +852,6 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer) ret = gst_pad_push (alpha->srcpad, outbuf); - GST_STREAM_UNLOCK (pad); - return ret; } |