Merge branch 'master' into 0.11

Conflicts:
	gst-libs/gst/rtp/gstbasertpdepayload.c

diff --cc gst-libs/gst/rtp/gstbasertpdepayload.c
index 3989c67,58489b1..cd6a22d
--- 1/gst-libs/gst/rtp/gstbasertpdepayload.c
--- 2/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@@ -271,9 -271,8 +271,9 @@@ gst_base_rtp_depayload_chain (GstPad * 
    GstClockTime timestamp;
    guint16 seqnum;
    guint32 rtptime;
-   gboolean reset_seq, discont;
+   gboolean discont;
    gint gap;
 +  GstRTPBuffer rtp;
  
    filter = GST_BASE_RTP_DEPAYLOAD (GST_OBJECT_PARENT (pad));
    priv = filter->priv;
@@@ -298,12 -297,8 +298,11 @@@
    priv->timestamp = timestamp;
    priv->duration = GST_BUFFER_DURATION (in);
  
 -  seqnum = gst_rtp_buffer_get_seq (in);
 -  rtptime = gst_rtp_buffer_get_timestamp (in);
 +  gst_rtp_buffer_map (in, GST_MAP_READ, &rtp);
 +  seqnum = gst_rtp_buffer_get_seq (&rtp);
 +  rtptime = gst_rtp_buffer_get_timestamp (&rtp);
 +  gst_rtp_buffer_unmap (&rtp);
 +
-   reset_seq = TRUE;
    discont = FALSE;
  
    GST_LOG_OBJECT (filter, "discont %d, seqnum %u, rtptime %u, timestamp %"

diff --cc gst-libs/gst/rtp/gstrtpbuffer.c
index a44c6f4,141b072..7e5de64
--- 1/gst-libs/gst/rtp/gstrtpbuffer.c
--- 2/gst-libs/gst/rtp/gstrtpbuffer.c
+++ b/gst-libs/gst/rtp/gstrtpbuffer.c
@@@ -1341,14 -1617,11 +1341,11 @@@ gst_rtp_buffer_add_extension_onebyte_he
  
    g_return_val_if_fail (id > 0 && id < 15, FALSE);
    g_return_val_if_fail (size >= 1 && size <= 16, FALSE);
 -  g_return_val_if_fail (gst_buffer_is_writable (buffer), FALSE);
 +  g_return_val_if_fail (gst_buffer_is_writable (rtp->buffer), FALSE);
  
 -  has_bit = gst_rtp_buffer_get_extension_data (buffer, &bits,
 +  has_bit = gst_rtp_buffer_get_extension_data (rtp, &bits,
        (gpointer) & pdata, &wordlen);
  
-   bytelen = wordlen * 4;
- 
    if (has_bit) {
      gulong offset = 0;
      guint8 *nextext;
@@@ -1465,14 -1738,11 +1462,11 @@@ gst_rtp_buffer_add_extension_twobytes_h
  
    g_return_val_if_fail ((appbits & 0xF0) == 0, FALSE);
    g_return_val_if_fail (size < 256, FALSE);
 -  g_return_val_if_fail (gst_buffer_is_writable (buffer), FALSE);
 +  g_return_val_if_fail (gst_buffer_is_writable (rtp->buffer), FALSE);
  
 -  has_bit = gst_rtp_buffer_get_extension_data (buffer, &bits,
 +  has_bit = gst_rtp_buffer_get_extension_data (rtp, &bits,
        (gpointer) & pdata, &wordlen);
  
-   bytelen = wordlen * 4;
- 
    if (has_bit) {
      gulong offset = 0;
      guint8 *nextext;