mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source 
Conflicts:
	libs/gst/base/gstcollectpads2.c
This commit is contained in:
Mark Nauwelaerts 2012-04-17 12:29:50 +02:00
commit 304047b13d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1800,12 +1800,8 @@ gst_collect_pads2_event_default (GstCollectPads2 * pads, GstCollectData2 * data,
GST_DEBUG_OBJECT (data->pad, "got segment %" GST_SEGMENT_FORMAT, &seg); GST_DEBUG_OBJECT (data->pad, "got segment %" GST_SEGMENT_FORMAT, &seg);
/* default muxing functionality */
if (!buffer_func)
goto newsegment_done;
/* default collection can not handle other segment formats than time */ /* default collection can not handle other segment formats than time */
if (seg.format != GST_FORMAT_TIME) { if (buffer_func && seg.format != GST_FORMAT_TIME) {
GST_WARNING_OBJECT (pads, "GstCollectPads2 default collecting " GST_WARNING_OBJECT (pads, "GstCollectPads2 default collecting "
"can only handle time segments. Non time segment ignored."); "can only handle time segments. Non time segment ignored.");
goto newsegment_done; goto newsegment_done;
@ -1814,6 +1810,10 @@ gst_collect_pads2_event_default (GstCollectPads2 * pads, GstCollectData2 * data,
data->segment = seg; data->segment = seg;
GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_NEW_SEGMENT); GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_NEW_SEGMENT);
/* default muxing functionality */
if (!buffer_func)
goto newsegment_done;
/* If oldest time is not known, or current pad got newsegment; /* If oldest time is not known, or current pad got newsegment;
* recalculate the state */ * recalculate the state */
if (!pads->priv->earliest_data || pads->priv->earliest_data == data) { if (!pads->priv->earliest_data || pads->priv->earliest_data == data) {