Merge branch 'master' into 0.11

Conflicts:
	gst-libs/gst/video/convertframe.c

diff --cc gst-libs/gst/app/gstappsink.c
Simple merge

diff --cc gst-libs/gst/app/gstappsrc.c
Simple merge

diff --cc gst-libs/gst/audio/gstaudiofilter.h
Simple merge

diff --cc gst-libs/gst/audio/gstbaseaudiosink.c
Simple merge

diff --cc gst-libs/gst/audio/gstringbuffer.h
Simple merge

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

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

diff --cc gst-libs/gst/rtp/gstbasertpdepayload.h
Simple merge

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

diff --cc gst-libs/gst/rtp/gstbasertppayload.h
Simple merge

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

diff --cc gst-libs/gst/video/convertframe.c
index 5220eb9,58dc426..3d71675
--- 1/gst-libs/gst/video/convertframe.c
--- 2/gst-libs/gst/video/convertframe.c
+++ b/gst-libs/gst/video/convertframe.c
@@@ -233,10 -233,9 +233,10 @@@ link_failed
  /**
   * gst_video_convert_frame:
   * @buf: a #GstBuffer
 + * @from_caps: the #GstCaps to convert from
   * @to_caps: the #GstCaps to convert to
   * @timeout: the maximum amount of time allowed for the processing.
-  * @err: pointer to a #GError. Can be %NULL.
+  * @error: pointer to a #GError. Can be %NULL.
   *
   * Converts a raw video buffer into the specified output caps.
   *
@@@ -256,9 -255,9 +256,9 @@@ gst_video_convert_frame (GstBuffer * bu
  {
    GstMessage *msg;
    GstBuffer *result = NULL;
-   GError *error = NULL;
+   GError *err = NULL;
    GstBus *bus;
 -  GstCaps *from_caps, *to_caps_copy = NULL;
 +  GstCaps *to_caps_copy = NULL;
    GstFlowReturn ret;
    GstElement *pipeline, *src, *sink;
    guint i, n;

diff --cc gst-libs/gst/video/video.c
Simple merge

diff --cc gst/subparse/gstsubparse.c
Simple merge