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 
Conflicts:
	gst/gstpad.c
	libs/gst/base/gstbaseparse.c
This commit is contained in:
Sebastian Dröge 2011-11-24 11:23:07 +01:00
parent 13e7839653 0280a3c29f
commit 1fa356a23c
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gst/base/gstbaseparse.c
View file

@ -1145,8 +1145,17 @@ gst_base_parse_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
gst_caps_unref (caps);
res = TRUE;
} else
res = gst_pad_peer_query (parse->srcpad, query);
} else {
GstCaps *caps, *filter;
gst_query_parse_caps (query, &filter);
caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
gst_query_set_caps_result (query, caps);
gst_caps_unref (caps);
res = TRUE;
}
break;
}
default:

3
plugins/elements/gstmultiqueue.c
View file

@ -1730,8 +1730,6 @@ single_queue_overrun_cb (GstDataQueue * dq, GstSingleQueue * sq)
"Another queue is empty, bumping single queue %d max visible to %d",
sq->id, sq->max_size.visible);
}
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
goto beach;
}
/* check if we reached the hard time/bytes limits */
gst_data_queue_get_level (oq->queue, &ssize);
@ -1765,7 +1763,6 @@ single_queue_overrun_cb (GstDataQueue * dq, GstSingleQueue * sq)
g_signal_emit (mq, gst_multi_queue_signals[SIGNAL_OVERRUN], 0);
}
beach:
return;
}