mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-10-28 11:33:44 +02:00
parent f2102d386f 1eb3380973
commit b8e1506b08
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/gst/base/gstcollectpads2.c
View file

@ -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: