Merge branch 'master' into 0.11

Conflicts:
	gst/avi/gstavidemux.c
	gst/rtp/gstrtpac3depay.c
	gst/rtp/gstrtpg726depay.c
	gst/rtp/gstrtpmpvdepay.c
	gst/videofilter/gstgamma.c

diff --cc configure.ac
Simple merge

diff --cc ext/flac/gstflacdec.c
Simple merge

diff --cc gst/avi/gstavidemux.c
index 845ccf8,5f2673b..def2b93
--- 1/gst/avi/gstavidemux.c
--- 2/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@@ -1878,10 -1900,9 +1878,12 @@@ gst_avi_demux_roundup_list (GstAviDemu
  
      GST_DEBUG_OBJECT (avi, "rounding up dubious list size %d", size);
      obuf = gst_buffer_new_and_alloc (size + 1);
 -    memcpy (GST_BUFFER_DATA (obuf), GST_BUFFER_DATA (*buf), size);
 +
 +    data = gst_buffer_map (obuf, NULL, NULL, GST_MAP_WRITE);
 +    gst_buffer_extract (*buf, 0, data, size);
+     /* assume 0 padding, at least makes outcome deterministic */
 -    (GST_BUFFER_DATA (obuf))[size] = 0;
++    data[size] = 0;
 +    gst_buffer_unmap (obuf, data, size + 1);
      gst_buffer_replace (buf, obuf);
    }
  }

diff --cc gst/isomp4/qtdemux.c
Simple merge

diff --cc gst/matroska/matroska-demux.c
index 788c8dd,3a4be60..02a0ffc
--- 1/gst/matroska/matroska-demux.c
--- 2/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@@ -2687,11 -2451,11 +2451,11 @@@ gst_matroska_demux_handle_seek_event (G
      /* upstream takes care of flushing and all that
       * ... and newsegment event handling takes care of the rest */
      return perform_seek_to_offset (demux,
-         entry->pos + demux->ebml_segment_start);
+         entry->pos + demux->common.ebml_segment_start);
    }
  
 -  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
 -  keyunit = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
 +  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
 +  keyunit = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
  
    if (flush) {
      GST_DEBUG_OBJECT (demux, "Starting flush");

diff --cc gst/rtp/gstrtpac3depay.c
index 099be64,cb6304e..17da501
--- 1/gst/rtp/gstrtpac3depay.c
--- 2/gst/rtp/gstrtpac3depay.c
+++ b/gst/rtp/gstrtpac3depay.c
@@@ -165,35 -168,39 +165,36 @@@ gst_rtp_ac3_depay_process (GstBaseRTPDe
  
    rtpac3depay = GST_RTP_AC3_DEPAY (depayload);
  
 -  {
 -    guint8 *payload;
 -    guint16 FT, NF;
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
  
 -    if (gst_rtp_buffer_get_payload_len (buf) < 2)
 -      goto empty_packet;
 +  if (gst_rtp_buffer_get_payload_len (&rtp) < 2)
 +    goto empty_packet;
  
 -    payload = gst_rtp_buffer_get_payload (buf);
 +  payload = gst_rtp_buffer_get_payload (&rtp);
  
 -    /* strip off header
 -     *
 -     *  0                   1
 -     *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
 -     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 -     * |    MBZ    | FT|       NF      |
 -     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 -     */
 -    FT = payload[0] & 0x3;
 -    NF = payload[1];
 +  /* strip off header
 +   *
 +   *  0                   1
 +   *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
 +   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +   * |    MBZ    | FT|       NF      |
 +   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +   */
 +  FT = payload[0] & 0x3;
 +  NF = payload[1];
  
 -    GST_DEBUG_OBJECT (rtpac3depay, "FT: %d, NF: %d", FT, NF);
 +  GST_DEBUG_OBJECT (rtpac3depay, "FT: %d, NF: %d", FT, NF);
  
 -    /* We don't bother with fragmented packets yet */
 -    outbuf = gst_rtp_buffer_get_payload_subbuffer (buf, 2, -1);
 +  /* We don't bother with fragmented packets yet */
 +  outbuf = gst_rtp_buffer_get_payload_subbuffer (&rtp, 2, -1);
  
 -    if (outbuf)
 -        GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %d",
 -            GST_BUFFER_SIZE (outbuf));
 +  gst_rtp_buffer_unmap (&rtp);
  
-   GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %d",
-       gst_buffer_get_size (outbuf));
 -    return outbuf;
 -  }
++  if (outbuf)
++    GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %d",
++        gst_buffer_get_size (outbuf));
  
 -  return NULL;
 +  return outbuf;
  
    /* ERRORS */
  empty_packet:

diff --cc gst/rtp/gstrtpbvdepay.c
index a01aa47,1957cee..7b8d67f
--- 1/gst/rtp/gstrtpbvdepay.c
--- 2/gst/rtp/gstrtpbvdepay.c
+++ b/gst/rtp/gstrtpbvdepay.c
@@@ -153,20 -156,16 +153,20 @@@ gst_rtp_bv_depay_process (GstBaseRTPDep
  {
    GstBuffer *outbuf;
    gboolean marker;
 +  GstRTPBuffer rtp = { NULL, };
 +
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
  
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  marker = gst_rtp_buffer_get_marker (&rtp);
  
    GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
 -      GST_BUFFER_SIZE (buf), marker,
 -      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 +      gst_buffer_get_size (buf), marker,
 +      gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp));
  
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   if (marker) {
+   if (marker && outbuf) {
      /* mark start of talkspurt with DISCONT */
      GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
    }

diff --cc gst/rtp/gstrtpg722depay.c
index 8f0f2c5,0815b23..e792e60
--- 1/gst/rtp/gstrtpg722depay.c
--- 2/gst/rtp/gstrtpg722depay.c
+++ b/gst/rtp/gstrtpg722depay.c
@@@ -231,11 -233,10 +231,11 @@@ gst_rtp_g722_depay_process (GstBaseRTPD
  
    GST_DEBUG_OBJECT (rtpg722depay, "got payload of %d bytes", payload_len);
  
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
 +  marker = gst_rtp_buffer_get_marker (&rtp);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   if (marker) {
+   if (marker && outbuf) {
      /* mark talk spurt with DISCONT */
      GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
    }

diff --cc gst/rtp/gstrtpg726depay.c
index cf88bd6,33247d0..2f34a0d
--- 1/gst/rtp/gstrtpg726depay.c
--- 2/gst/rtp/gstrtpg726depay.c
+++ b/gst/rtp/gstrtpg726depay.c
@@@ -221,20 -221,31 +221,24 @@@ gst_rtp_g726_depay_process (GstBaseRTPD
  
    if (depay->aal2 || depay->force_aal2) {
      /* AAL2, we can just copy the bytes */
 -    outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +    outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
+     if (!outbuf)
+       goto bad_len;
    } else {
 -    guint8 *in, *out, tmp;
 +    guint8 *in, *out, tmp, *odata;
      guint len;
 +    gsize osize;
  
 -    in = gst_rtp_buffer_get_payload (buf);
 -    len = gst_rtp_buffer_get_payload_len (buf);
 -
 -    if (gst_buffer_is_writable (buf)) {
 -      outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 -    } else {
 -      GstBuffer *copy;
 -
 -      /* copy buffer */
 -      copy = gst_buffer_copy (buf);
 -      outbuf = gst_rtp_buffer_get_payload_buffer (copy);
 -      gst_buffer_unref (copy);
 -    }
 +    in = gst_rtp_buffer_get_payload (&rtp);
 +    len = gst_rtp_buffer_get_payload_len (&rtp);
  
 +    outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
+     if (!outbuf)
+       goto bad_len;
 +    outbuf = gst_buffer_make_writable (outbuf);
  
 -    out = GST_BUFFER_DATA (outbuf);
 +    odata = gst_buffer_map (outbuf, &osize, NULL, GST_MAP_WRITE);
 +    out = odata;
  
      /* we need to reshuffle the bytes, input is always of the form
       * A B C D ... with the number of bits depending on the bitrate. */

diff --cc gst/rtp/gstrtpgsmdepay.c
index 30f6a7f,ca54ea8..298708a
--- 1/gst/rtp/gstrtpgsmdepay.c
--- 2/gst/rtp/gstrtpgsmdepay.c
+++ b/gst/rtp/gstrtpgsmdepay.c
@@@ -122,21 -127,16 +122,21 @@@ gst_rtp_gsm_depay_process (GstBaseRTPDe
  {
    GstBuffer *outbuf = NULL;
    gboolean marker;
 +  GstRTPBuffer rtp = { NULL };
 +
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
  
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  marker = gst_rtp_buffer_get_marker (&rtp);
  
    GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
 -      GST_BUFFER_SIZE (buf), marker,
 -      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 +      gst_buffer_get_size (buf), marker,
 +      gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp));
 +
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
  
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   if (marker) {
+   if (marker && outbuf) {
      /* mark start of talkspurt with DISCONT */
      GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
    }

diff --cc gst/rtp/gstrtpilbcdepay.c
index 6c22596,d5465c2..f8e8ab5
--- 1/gst/rtp/gstrtpilbcdepay.c
--- 2/gst/rtp/gstrtpilbcdepay.c
+++ b/gst/rtp/gstrtpilbcdepay.c
@@@ -176,21 -179,16 +176,21 @@@ gst_rtp_ilbc_depay_process (GstBaseRTPD
  {
    GstBuffer *outbuf;
    gboolean marker;
 +  GstRTPBuffer rtp = { NULL };
  
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
 +
 +  marker = gst_rtp_buffer_get_marker (&rtp);
  
    GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
 -      GST_BUFFER_SIZE (buf), marker,
 -      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 +      gst_buffer_get_size (buf), marker,
 +      gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp));
 +
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
  
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   if (marker) {
+   if (marker && outbuf) {
      /* mark start of talkspurt with DISCONT */
      GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
    }

diff --cc gst/rtp/gstrtpmpvdepay.c
index d6e856b,1dea394..c94eb63
--- 1/gst/rtp/gstrtpmpvdepay.c
--- 2/gst/rtp/gstrtpmpvdepay.c
+++ b/gst/rtp/gstrtpmpvdepay.c
@@@ -170,12 -174,14 +170,13 @@@ gst_rtp_mpv_depay_process (GstBaseRTPDe
        payload += 4;
      }
  
 -    outbuf = gst_rtp_buffer_get_payload_subbuffer (buf, payload_header, -1);
 +    outbuf = gst_rtp_buffer_get_payload_subbuffer (&rtp, payload_header, -1);
  
-     GST_DEBUG_OBJECT (rtpmpvdepay,
-         "gst_rtp_mpv_depay_chain: pushing buffer of size %d",
-         gst_buffer_get_size (outbuf));
- 
+     if (outbuf) {
+       GST_DEBUG_OBJECT (rtpmpvdepay,
+           "gst_rtp_mpv_depay_chain: pushing buffer of size %d",
 -          GST_BUFFER_SIZE (outbuf));
++          gst_buffer_get_size (outbuf));
+     }
 -
      return outbuf;
    }
  

diff --cc gst/rtp/gstrtppcmadepay.c
index 27d463f,50c858a..4d4a80e
--- 1/gst/rtp/gstrtppcmadepay.c
--- 2/gst/rtp/gstrtppcmadepay.c
+++ b/gst/rtp/gstrtppcmadepay.c
@@@ -130,29 -133,26 +130,31 @@@ gst_rtp_pcma_depay_process (GstBaseRTPD
    GstBuffer *outbuf = NULL;
    gboolean marker;
    guint len;
 +  GstRTPBuffer rtp = { NULL };
 +
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
  
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  marker = gst_rtp_buffer_get_marker (&rtp);
  
    GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
 -      GST_BUFFER_SIZE (buf), marker,
 -      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 +      gst_buffer_get_size (buf), marker,
 +      gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp));
  
 -  len = gst_rtp_buffer_get_payload_len (buf);
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +  len = gst_rtp_buffer_get_payload_len (&rtp);
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   GST_BUFFER_DURATION (outbuf) =
-       gst_util_uint64_scale_int (len, GST_SECOND, depayload->clock_rate);
+   if (outbuf) {
+     GST_BUFFER_DURATION (outbuf) =
+         gst_util_uint64_scale_int (len, GST_SECOND, depayload->clock_rate);
  
-   if (marker) {
-     /* mark start of talkspurt with DISCONT */
-     GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
+     if (marker) {
+       /* mark start of talkspurt with DISCONT */
+       GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
+     }
    }
  
 +
    return outbuf;
  }
  

diff --cc gst/rtp/gstrtppcmudepay.c
index 0a208cd,395599b..36dfd46
--- 1/gst/rtp/gstrtppcmudepay.c
--- 2/gst/rtp/gstrtppcmudepay.c
+++ b/gst/rtp/gstrtppcmudepay.c
@@@ -130,26 -134,24 +131,28 @@@ gst_rtp_pcmu_depay_process (GstBaseRTPD
    GstBuffer *outbuf = NULL;
    guint len;
    gboolean marker;
 +  GstRTPBuffer rtp = { NULL };
 +
 +  gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp);
  
 -  marker = gst_rtp_buffer_get_marker (buf);
 +  marker = gst_rtp_buffer_get_marker (&rtp);
  
    GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d",
 -      GST_BUFFER_SIZE (buf), marker,
 -      gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 +      gst_buffer_get_size (buf), marker,
 +      gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp));
  
 -  len = gst_rtp_buffer_get_payload_len (buf);
 -  outbuf = gst_rtp_buffer_get_payload_buffer (buf);
 +  len = gst_rtp_buffer_get_payload_len (&rtp);
 +  outbuf = gst_rtp_buffer_get_payload_buffer (&rtp);
 +  gst_rtp_buffer_unmap (&rtp);
  
-   GST_BUFFER_DURATION (outbuf) =
-       gst_util_uint64_scale_int (len, GST_SECOND, depayload->clock_rate);
+   if (outbuf) {
+     GST_BUFFER_DURATION (outbuf) =
+         gst_util_uint64_scale_int (len, GST_SECOND, depayload->clock_rate);
  
-   if (marker) {
-     /* mark start of talkspurt with DISCONT */
-     GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
+     if (marker) {
+       /* mark start of talkspurt with DISCONT */
+       GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
+     }
    }
  
    return outbuf;

diff --cc gst/rtsp/gstrtspsrc.c
Simple merge

diff --cc sys/v4l2/gstv4l2object.c
Simple merge

diff --cc sys/v4l2/gstv4l2sink.c
index fcf7e87,8672a1d..1c8108b
--- 1/sys/v4l2/gstv4l2sink.c
--- 2/sys/v4l2/gstv4l2sink.c
+++ b/sys/v4l2/gstv4l2sink.c
@@@ -105,10 -107,12 +107,10 @@@ gst_v4l2sink_iface_supported (GstImplem
    g_assert (iface_type == GST_TYPE_X_OVERLAY ||
        iface_type == GST_TYPE_NAVIGATION ||
        iface_type == GST_TYPE_COLOR_BALANCE ||
-       iface_type == GST_TYPE_VIDEO_ORIENTATION);
 -      iface_type == GST_TYPE_VIDEO_ORIENTATION ||
 -      iface_type == GST_TYPE_TUNER);
++      iface_type == GST_TYPE_VIDEO_ORIENTATION || iface_type == GST_TYPE_TUNER);
  #else
    g_assert (iface_type == GST_TYPE_COLOR_BALANCE ||
-       iface_type == GST_TYPE_VIDEO_ORIENTATION);
 -      iface_type == GST_TYPE_VIDEO_ORIENTATION ||
 -      iface_type == GST_TYPE_TUNER);
++      iface_type == GST_TYPE_VIDEO_ORIENTATION || iface_type == GST_TYPE_TUNER);
  #endif
  
    if (v4l2object->video_fd == -1)