From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 24 May 2011 07:47:15 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~511^2~7629
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a87c02123746982e10032ed02dc7b8b4df35b3f7;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

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

a87c02123746982e10032ed02dc7b8b4df35b3f7
diff --cc gst-libs/gst/video/convertframe.c
index 5220eb9,58dc426..3d71675
--- a/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;