mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 17:52:29 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
b8e1506b08
1 changed files with 3 additions and 2 deletions
|
@ -1779,11 +1779,11 @@ gst_collect_pads2_chain (GstPad * pad, GstBuffer * buffer)
|
||||||
if (pads->clip_func) {
|
if (pads->clip_func) {
|
||||||
GstBuffer *outbuf = NULL;
|
GstBuffer *outbuf = NULL;
|
||||||
ret = pads->clip_func (pads, data, buffer, &outbuf, pads->clip_user_data);
|
ret = pads->clip_func (pads, data, buffer, &outbuf, pads->clip_user_data);
|
||||||
|
buffer = outbuf;
|
||||||
|
|
||||||
if (G_UNLIKELY (outbuf == NULL))
|
if (G_UNLIKELY (outbuf == NULL))
|
||||||
goto clipped;
|
goto clipped;
|
||||||
|
|
||||||
buffer = outbuf;
|
|
||||||
if (G_UNLIKELY (ret == GST_FLOW_UNEXPECTED))
|
if (G_UNLIKELY (ret == GST_FLOW_UNEXPECTED))
|
||||||
goto unexpected;
|
goto unexpected;
|
||||||
else if (G_UNLIKELY (ret != GST_FLOW_OK))
|
else if (G_UNLIKELY (ret != GST_FLOW_OK))
|
||||||
|
@ -1864,7 +1864,8 @@ gst_collect_pads2_chain (GstPad * pad, GstBuffer * buffer)
|
||||||
unlock_done:
|
unlock_done:
|
||||||
GST_COLLECT_PADS2_STREAM_UNLOCK (pads);
|
GST_COLLECT_PADS2_STREAM_UNLOCK (pads);
|
||||||
unref_data (data);
|
unref_data (data);
|
||||||
gst_buffer_unref (buffer);
|
if (buffer)
|
||||||
|
gst_buffer_unref (buffer);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
pad_removed:
|
pad_removed:
|
||||||
|
|
Loading…
Reference in a new issue