diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:07:04 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2005-05-25 12:07:04 +0000 |
commit | bd8af68852446accca277d66ea2a7b003f8edb9a (patch) | |
tree | 7acad80064eb030ee997e484df5233c6ccfb0f31 /gst | |
parent | 2bed7c60aa6070629c924174780af9cccf102b1a (diff) |
gst/ffmpegcolorspace/gstffmpegcolorspace.c: No need to take the STREAM lock anymore.
Original commit message from CVS:
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
(gst_ffmpegcsp_getcaps), (gst_ffmpegcsp_configure_context),
(gst_ffmpegcsp_setcaps), (gst_ffmpegcsp_bufferalloc),
(gst_ffmpegcsp_chain), (gst_ffmpegcsp_change_state):
No need to take the STREAM lock anymore.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/ffmpegcolorspace/gstffmpegcolorspace.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index 9c247a5d9..3778d8737 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -412,8 +412,6 @@ gst_ffmpegcsp_chain (GstPad * pad, GstBuffer * buffer) space = GST_FFMPEGCSP (GST_PAD_PARENT (pad)); - GST_STREAM_LOCK (pad); - GST_DEBUG ("from %d -> to %d", space->from_pixfmt, space->to_pixfmt); if (space->from_pixfmt == PIX_FMT_NB || space->to_pixfmt == PIX_FMT_NB) goto unkown_format; @@ -460,20 +458,17 @@ gst_ffmpegcsp_chain (GstPad * pad, GstBuffer * buffer) } res = gst_pad_push (space->srcpad, outbuf); - GST_STREAM_UNLOCK (pad); return res; /* ERRORS */ no_buffer: { - GST_STREAM_UNLOCK (pad); gst_buffer_unref (buffer); return GST_FLOW_ERROR; } unkown_format: { - GST_STREAM_UNLOCK (pad); GST_ELEMENT_ERROR (space, CORE, NOT_IMPLEMENTED, (NULL), ("attempting to convert colorspaces between unknown formats")); gst_buffer_unref (buffer); @@ -500,11 +495,9 @@ gst_ffmpegcsp_change_state (GstElement * element) switch (transition) { case GST_STATE_PAUSED_TO_READY: - GST_STREAM_LOCK (space->sinkpad); if (space->palette) av_free (space->palette); space->palette = NULL; - GST_STREAM_UNLOCK (space->sinkpad); break; default: break; |