Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 08:30:41 +0000 (10:30 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 08:30:41 +0000 (10:30 +0200)
1  2 
gst/gstbus.c
gst/gstelementfactory.c
gst/gstregistrychunks.c
gst/gsttypefind.c
gst/gstutils.c
libs/gst/base/gstbasetransform.c

diff --cc gst/gstbus.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gst/gstutils.c
Simple merge
@@@ -1716,9 -1715,10 +1716,10 @@@ gst_base_transform_buffer_alloc (GstPa
    GstBaseTransformClass *klass;
    GstBaseTransformPrivate *priv;
    GstFlowReturn res;
+   gboolean alloced = FALSE;
    gboolean proxy, suggest, same_caps;
    GstCaps *sink_suggest = NULL;
 -  guint size_suggest;
 +  gsize size_suggest;
  
    trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
    if (G_UNLIKELY (trans == NULL))