Merge branch 'master' into 0.11-fdo

diff --cc configure.ac
Simple merge

diff --cc ext/ogg/gstoggparse.c
Simple merge

diff --cc gst-libs/gst/pbutils/encoding-profile.c
Simple merge

diff --cc gst-libs/gst/rtp/gstrtpbuffer.c
index 02bc1df,149a966..2f27d8a
--- 1/gst-libs/gst/rtp/gstrtpbuffer.c
--- 2/gst-libs/gst/rtp/gstrtpbuffer.c
+++ b/gst-libs/gst/rtp/gstrtpbuffer.c
@@@ -1502,15 -1779,15 +1502,15 @@@ gst_rtp_buffer_add_extension_twobytes_h
        wordlen = extlen / 4;
      }
  
 -    gst_rtp_buffer_set_extension_data (buffer, (0x100 << 4) | (appbits & 0x0F),
 +    gst_rtp_buffer_set_extension_data (rtp, (0x100 << 4) | (appbits & 0x0F),
          wordlen);
    } else {
-     wordlen = (size + 1) / 4 + (((size + 1) % 4) ? 1 : 0);
+     wordlen = (size + 2) / 4 + (((size + 2) % 4) ? 1 : 0);
  
 -    gst_rtp_buffer_set_extension_data (buffer, (0x100 << 4) | (appbits & 0x0F),
 +    gst_rtp_buffer_set_extension_data (rtp, (0x100 << 4) | (appbits & 0x0F),
          wordlen);
  
 -    gst_rtp_buffer_get_extension_data (buffer, &bits,
 +    gst_rtp_buffer_get_extension_data (rtp, &bits,
          (gpointer) & pdata, &wordlen);
  
      pdata[0] = id;

diff --cc gst-libs/gst/tag/gstxmptag.c
Simple merge

diff --cc gst/playback/gstplaybin2.c
Simple merge

diff --cc gst/playback/gstplaysink.c
Simple merge

diff --cc gst/videoscale/gstvideoscale.c
Simple merge

diff --cc tests/check/libs/video.c
Simple merge