Merge branch 'master' into 0.11

Conflicts:
	ext/theora/gsttheoraenc.c

diff --cc ext/theora/gsttheoraenc.c
index e2953db,c580675..f32d230
--- 1/ext/theora/gsttheoraenc.c
--- 2/ext/theora/gsttheoraenc.c
+++ b/ext/theora/gsttheoraenc.c
@@@ -1295,8 -1273,7 +1283,8 @@@ theora_enc_chain (GstPad * pad, GstBuff
  
      if (enc->multipass_cache_fd
          && enc->multipass_mode == MULTIPASS_MODE_FIRST_PASS) {
-       if (!theora_enc_write_multipass_cache (enc)) {
+       if (!theora_enc_write_multipass_cache (enc, FALSE, FALSE)) {
 +        gst_buffer_unmap (buffer, data, size);
          ret = GST_FLOW_ERROR;
          goto multipass_write_failed;
        }

diff --cc gst-libs/gst/rtp/gstrtcpbuffer.c
Simple merge

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

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

diff --cc gst-libs/gst/tag/gstxmptag.c
index ae0332c,6c424ba..ea60a74
--- 1/gst-libs/gst/tag/gstxmptag.c
--- 2/gst-libs/gst/tag/gstxmptag.c
+++ b/gst-libs/gst/tag/gstxmptag.c
@@@ -984,7 -984,7 +984,7 @@@ static voi
  xmp_tags_initialize ()
  {
    static GOnce my_once = G_ONCE_INIT;
-   g_once (&my_once, _init_xmp_tag_map, NULL);
 -  g_once (&my_once, (GThreadFunc)_init_xmp_tag_map, NULL);
++  g_once (&my_once, (GThreadFunc) _init_xmp_tag_map, NULL);
  }
  
  typedef struct _GstXmpNamespaceMatch GstXmpNamespaceMatch;

diff --cc gst/audioresample/gstaudioresample.c
Simple merge

diff --cc sys/xvimage/xvimagesink.c
Simple merge

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