Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 06:59:58 +0000 (08:59 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 06:59:58 +0000 (08:59 +0200)
19 files changed:
1  2 
gst/gst.c
gst/gstbufferlist.c
gst/gstghostpad.c
gst/gstminiobject.c
gst/gstpad.c
gst/gstutils.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbasesink.c
libs/gst/base/gstbasetransform.c
plugins/elements/gstfunnel.c
plugins/elements/gstinputselector.c
plugins/elements/gstmultiqueue.c
plugins/elements/gstqueue.c
plugins/elements/gstqueue2.c
plugins/elements/gsttee.c
tests/check/elements/multiqueue.c
tests/check/gst/gstutils.c
tests/check/gst/gstvalue.c
tests/check/libs/test_transform.c

diff --cc gst/gst.c
+++ b/gst/gst.c
@@@ -756,13 -750,16 +756,14 @@@ init_post (GOptionContext * context, GO
    g_type_class_ref (gst_caps_intersect_mode_get_type ());
  
    gst_structure_get_type ();
 -  _gst_value_initialize ();
 -  g_type_class_ref (gst_param_spec_fraction_get_type ());
 -  gst_caps_get_type ();
    _gst_event_initialize ();
    _gst_buffer_initialize ();
 -  _gst_buffer_list_initialize ();
 -  gst_buffer_list_iterator_get_type ();
    _gst_message_initialize ();
 +  _gst_buffer_list_initialize ();
 +  _gst_value_initialize ();
 +  g_type_class_ref (gst_param_spec_fraction_get_type ());
    _gst_tag_initialize ();
+   gst_parse_context_get_type ();
  
    _gst_plugin_initialize ();
  
Simple merge
Simple merge
Simple merge
diff --cc gst/gstpad.c
Simple merge
diff --cc gst/gstutils.c
Simple merge
Simple merge
Simple merge
@@@ -1713,9 -1717,11 +1718,11 @@@ gst_base_transform_buffer_alloc (GstPa
    GstFlowReturn res;
    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))
+     return GST_FLOW_WRONG_STATE;
    klass = GST_BASE_TRANSFORM_GET_CLASS (trans);
    priv = trans->priv;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge