Merge branch 'master' into 0.11

Conflicts:
	gst/mpegtsdemux/mpegtsbase.c
	gst/mpegtsdemux/mpegtspacketizer.c
	gst/mpegtsdemux/tsdemux.c
	gst/mve/gstmvedemux.c

diff --cc gst/camerabin2/gstwrappercamerabinsrc.c
Simple merge

diff --cc gst/mpegtsdemux/mpegtsbase.c
Simple merge

diff --cc gst/mpegtsdemux/mpegtspacketizer.c
index 148e541,d88fd19..f16514b
--- 1/gst/mpegtsdemux/mpegtspacketizer.c
--- 2/gst/mpegtsdemux/mpegtspacketizer.c
+++ b/gst/mpegtsdemux/mpegtspacketizer.c
@@@ -2403,10 -2350,9 +2408,9 @@@ mpegts_packetizer_push_section (MpegTSP
  
    /* create a sub buffer from the start of the section (table_id and
     * section_length included) to the end */
 -  sub_buf = gst_buffer_create_sub (packet->buffer,
 -      data - GST_BUFFER_DATA (packet->buffer), packet->data_end - data);
 +  sub_buf = gst_buffer_copy_region (packet->buffer, GST_BUFFER_COPY_ALL,
 +      data - packet->bufmap.data, packet->data_end - data);
  
- 
    stream = packetizer->streams[packet->pid];
    if (stream == NULL) {
      stream = mpegts_packetizer_stream_new ();

diff --cc gst/mpegtsdemux/tsdemux.c
index 70b464a,0fd86f9..f3a32d4
--- 1/gst/mpegtsdemux/tsdemux.c
--- 2/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@@ -1631,12 -1628,12 +1637,12 @@@ find_timestamps (MpegTSBase * base, gui
    demux->program = NULL;
  
    /* Find end position */
 -  if (G_UNLIKELY (!gst_pad_query_peer_duration (base->sinkpad, &format,
 -              &total_bytes) || format != GST_FORMAT_BYTES)) {
 +  if (G_UNLIKELY (!gst_pad_peer_query_duration (base->sinkpad, GST_FORMAT_BYTES,
 +              &total_bytes))) {
      GST_WARNING_OBJECT (base, "Couldn't get upstream size in bytes");
-     ret = GST_FLOW_ERROR;
      mpegts_packetizer_clear (base->packetizer);
-     return ret;
+ 
+     return GST_FLOW_ERROR;
    }
    GST_DEBUG ("Upstream is %" G_GINT64_FORMAT " bytes", total_bytes);
  
@@@ -1729,12 -1731,9 +1738,11 @@@ process_pcr (MpegTSBase * base, guint6
    pcrpattern = 0x47000020 | ((program->pcr_pid & 0x1fff) << 8);
  
    for (i = 0; (i < 20) && (nbpcr < numpcr); i++) {
 -    guint offset, size;
 +    guint offset;
 +    GstMapInfo map;
 +    gsize size;
  
-     ret =
-         gst_pad_pull_range (base->sinkpad,
+     ret = gst_pad_pull_range (base->sinkpad,
          initoff + i * 500 * base->packetsize, 500 * base->packetsize, &buf);
  
      if (G_UNLIKELY (ret != GST_FLOW_OK))

diff --cc gst/mve/gstmvedemux.c
index a101a90,85d6122..9851e68
--- 1/gst/mve/gstmvedemux.c
--- 2/gst/mve/gstmvedemux.c
+++ b/gst/mve/gstmvedemux.c
@@@ -1090,12 -1090,9 +1090,10 @@@ gst_mve_demux_base_init (GstMveDemuxCla
  
    GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
  
-   gst_element_class_add_pad_template (element_class,
-       gst_static_pad_template_get (&sink_template));
-   gst_element_class_add_pad_template (element_class,
-       gst_static_pad_template_get (&vidsrc_template));
-   gst_element_class_add_pad_template (element_class,
-       gst_static_pad_template_get (&audsrc_template));
+   gst_element_class_add_static_pad_template (element_class, &sink_template);
+   gst_element_class_add_static_pad_template (element_class, &vidsrc_template);
+   gst_element_class_add_static_pad_template (element_class, &audsrc_template);
++
    gst_element_class_set_details_simple (element_class, "MVE Demuxer",
        "Codec/Demuxer",
        "Demultiplex an Interplay movie (MVE) stream into audio and video",