Merge branch '0.10'

This commit is contained in:
Wim Taymans 2012-04-06 12:37:41 +02:00
commit fb8fbdaeb3

View file

@ -2096,7 +2096,7 @@ gst_queue2_handle_sink_event (GstPad * pad, GstObject * parent,
case GST_EVENT_FLUSH_START:
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush start event");
if (QUEUE_IS_USING_QUEUE (queue)) {
if (queue->srcpad->mode == GST_ACTIVATE_PUSH) {
/* forward event */
gst_pad_push_event (queue->srcpad, event);
@ -2128,7 +2128,7 @@ gst_queue2_handle_sink_event (GstPad * pad, GstObject * parent,
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush stop event");
if (QUEUE_IS_USING_QUEUE (queue)) {
if (queue->srcpad->mode == GST_ACTIVATE_PUSH) {
/* forward event */
gst_pad_push_event (queue->srcpad, event);