Commit b8e1506b authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

parents f2102d38 1eb33809
......@@ -1779,11 +1779,11 @@ gst_collect_pads2_chain (GstPad * pad, GstBuffer * buffer)
if (pads->clip_func) {
GstBuffer *outbuf = NULL;
ret = pads->clip_func (pads, data, buffer, &outbuf, pads->clip_user_data);
buffer = outbuf;
if (G_UNLIKELY (outbuf == NULL))
goto clipped;
buffer = outbuf;
if (G_UNLIKELY (ret == GST_FLOW_UNEXPECTED))
goto unexpected;
else if (G_UNLIKELY (ret != GST_FLOW_OK))
......@@ -1864,7 +1864,8 @@ gst_collect_pads2_chain (GstPad * pad, GstBuffer * buffer)
unlock_done:
GST_COLLECT_PADS2_STREAM_UNLOCK (pads);
unref_data (data);
gst_buffer_unref (buffer);
if (buffer)
gst_buffer_unref (buffer);
return ret;
pad_removed:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment