From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 17 Apr 2012 10:29:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Tag: RELEASE-0.11.91~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=304047b13d72ea87efd03ec768b75fa09d374fac;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	libs/gst/base/gstcollectpads2.c
---

304047b13d72ea87efd03ec768b75fa09d374fac
diff --cc libs/gst/base/gstcollectpads2.c
index e897063,7bf4ec6..0577232
--- a/libs/gst/base/gstcollectpads2.c
+++ b/libs/gst/base/gstcollectpads2.c
@@@ -1796,24 -1807,30 +1796,24 @@@ gst_collect_pads2_event_default (GstCol
  
        GST_COLLECT_PADS2_STREAM_LOCK (pads);
  
 -      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
 -          &start, &stop, &time);
 +      gst_event_copy_segment (event, &seg);
  
 -      GST_DEBUG_OBJECT (data->pad, "got newsegment, start %" GST_TIME_FORMAT
 -          ", stop %" GST_TIME_FORMAT, GST_TIME_ARGS (start),
 -          GST_TIME_ARGS (stop));
 +      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 */
-       if (seg.format != GST_FORMAT_TIME) {
 -      if (buffer_func && format != GST_FORMAT_TIME) {
++      if (buffer_func && seg.format != GST_FORMAT_TIME) {
          GST_WARNING_OBJECT (pads, "GstCollectPads2 default collecting "
              "can only handle time segments. Non time segment ignored.");
          goto newsegment_done;
        }
  
 -      /* accept segment */
 -      gst_segment_set_newsegment_full (&data->segment, update, rate, arate,
 -          format, start, stop, time);
 -
 +      data->segment = seg;
        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;
         * recalculate the state */
        if (!pads->priv->earliest_data || pads->priv->earliest_data == data) {