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

Merge remote-tracking branch 'origin/master' into 0.11

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-11-28 01:11:47 +00:00
parent 6ed2b05157 3b28af5171
commit 5acdc22001
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/elements/gstqueue2.c
View file

@ -2400,6 +2400,9 @@ next:
data = gst_queue2_dequeue_on_eos (queue, &item_type);
if (data != NULL)
goto next;
/* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
* to the caller so that the task function does not shut down */
result = GST_FLOW_OK;
}
} else if (item_type == GST_QUEUE2_ITEM_TYPE_EVENT) {
GstEvent *event = GST_EVENT_CAST (data);
@ -2442,6 +2445,9 @@ next:
data = gst_queue2_dequeue_on_eos (queue, &item_type);
if (data != NULL)
goto next;
/* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
* to the caller so that the task function does not shut down */
result = GST_FLOW_OK;
}
}
return result;