Merge branch 'master' into 0.11

Conflicts:
	gst/gstelementfactory.c
	gst/gstelementfactory.h
	gst/gstpad.h
	gst/gstpluginfeature.c
	gst/gstpluginfeature.h

diff --cc gst/gstelement.h
Simple merge

diff --cc gst/gstelementfactory.c
index 097c2cb,4c28e82..9ac76eb
--- 1/gst/gstelementfactory.c
--- 2/gst/gstelementfactory.c
+++ b/gst/gstelementfactory.c
@@@ -504,11 -504,113 +504,11 @@@ gst_element_factory_get_element_type (G
    return factory->type;
  }
  
- G_CONST_RETURN gchar *
 -/**
 - * gst_element_factory_get_longname:
 - * @factory: a #GstElementFactory
 - *
 - * Gets the longname for this factory
 - *
 - * Returns: the longname
 - */
 -const gchar *
 -gst_element_factory_get_longname (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -
 -  return factory->details.longname;
 -}
 -
 -/**
 - * gst_element_factory_get_klass:
 - * @factory: a #GstElementFactory
 - *
 - * Gets the class for this factory.
 - *
 - * Returns: the class
 - */
 -const gchar *
 -gst_element_factory_get_klass (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -
 -  return factory->details.klass;
 -}
 -
 -/**
 - * gst_element_factory_get_description:
 - * @factory: a #GstElementFactory
 - *
 - * Gets the description for this factory.
 - *
 - * Returns: the description
 - */
 -const gchar *
 -gst_element_factory_get_description (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -
 -  return factory->details.description;
 -}
 -
 -/**
 - * gst_element_factory_get_author:
 - * @factory: a #GstElementFactory
 - *
 - * Gets the author for this factory.
 - *
 - * Returns: the author
 - */
+ const gchar *
 -gst_element_factory_get_author (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -
 -  return factory->details.author;
 -}
 -
 -static const gchar *
 -gst_element_factory_get_meta_data (GstElementFactory * factory,
 +gst_element_factory_get_metadata (GstElementFactory * factory,
      const gchar * key)
  {
 -  if (!factory->meta_data)
 -    return NULL;
 -
 -  /* FIXME: do we want to support other types? */
 -  return gst_structure_get_string ((GstStructure *) factory->meta_data, key);
 -}
 -
 -/**
 - * gst_element_factory_get_documentation_uri:
 - * @factory: a #GstElementFactory
 - *
 - * Gets documentation uri for this factory if set.
 - *
 - * Since: 0.10.31
 - *
 - * Returns: the documentation uri
 - */
 -const gchar *
 -gst_element_factory_get_documentation_uri (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -  return gst_element_factory_get_meta_data (factory, "doc-uri");
 -}
 -
 -/**
 - * gst_element_factory_get_icon_name:
 - * @factory: a #GstElementFactory
 - *
 - * Gets icon name for this factory if set.
 - *
 - * Since: 0.10.31
 - *
 - * Returns: the icon name
 - */
 -const gchar *
 -gst_element_factory_get_icon_name (GstElementFactory * factory)
 -{
 -  g_return_val_if_fail (GST_IS_ELEMENT_FACTORY (factory), NULL);
 -  return gst_element_factory_get_meta_data (factory, "icon-name");
 +  return gst_structure_get_string ((GstStructure *) factory->metadata, key);
  }
  
  /**

diff --cc gst/gstelementfactory.h
index 323aa7a,fc33982..ee99594
--- 1/gst/gstelementfactory.h
--- 2/gst/gstelementfactory.h
+++ b/gst/gstelementfactory.h
@@@ -82,15 -146,16 +82,15 @@@ GType                   gst_element_fac
  GstElementFactory *     gst_element_factory_find                (const gchar *name);
  
  GType                   gst_element_factory_get_element_type    (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_longname        (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_klass           (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_description     (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_author          (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_documentation_uri (GstElementFactory *factory);
 -const gchar *           gst_element_factory_get_icon_name       (GstElementFactory *factory);
 +
- G_CONST_RETURN gchar *  gst_element_factory_get_metadata        (GstElementFactory *factory, const gchar *key);
++const gchar *           gst_element_factory_get_metadata        (GstElementFactory *factory, const gchar *key);
 +
  guint                   gst_element_factory_get_num_pad_templates (GstElementFactory *factory);
- G_CONST_RETURN GList *  gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
+ const GList *           gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
 +
  gint                    gst_element_factory_get_uri_type        (GstElementFactory *factory);
  gchar **                gst_element_factory_get_uri_protocols   (GstElementFactory *factory);
 +
  gboolean                gst_element_factory_has_interface       (GstElementFactory *factory,
                                                                   const gchar *interfacename);
  

diff --cc gst/gstinfo.c
Simple merge

diff --cc gst/gstpad.c
Simple merge

diff --cc gst/gstpad.h
index 13a7f9d,5317dee..dc10fee
--- 1/gst/gstpad.h
--- 2/gst/gstpad.h
+++ b/gst/gstpad.h
@@@ -165,7 -149,42 +165,7 @@@ typedef enum 
    GST_FLOW_CUSTOM_ERROR_2 = -102
  } GstFlowReturn;
  
- G_CONST_RETURN gchar* gst_flow_get_name       (GstFlowReturn ret);
 -/**
 - * GST_FLOW_IS_FATAL:
 - * @ret: a #GstFlowReturn value
 - *
 - * Macro to test if the given #GstFlowReturn value indicates a fatal
 - * error. This macro is mainly used in elements driving the pipeline to decide
 - * whether an error message should be posted on the bus. Note that such
 - * elements may also need to post an error message in the #GST_FLOW_NOT_LINKED
 - * case which is not caught by this macro.
 - *
 - * Deprecated: This macro is badly named and can't be used in any real
 - * scenarios without additional checks.
 - */
 -#ifndef GST_DISABLE_DEPRECATED
 -#define GST_FLOW_IS_FATAL(ret) ((ret) <= GST_FLOW_UNEXPECTED)
 -#endif
 -
 -/**
 - * GST_FLOW_IS_SUCCESS:
 - * @ret: a #GstFlowReturn value
 - *
 - * Macro to test if the given #GstFlowReturn value indicates a
 - * successfull result
 - * This macro is mainly used in elements to decide if the processing
 - * of a buffer was successfull.
 - *
 - * Since: 0.10.7
 - *
 - * Deprecated: This macro is badly named and can't be used in any real
 - * scenarios without additional checks.
 - */
 -#ifndef GST_DISABLE_DEPRECATED
 -#define GST_FLOW_IS_SUCCESS(ret) ((ret) >= GST_FLOW_OK)
 -#endif
 -
+ const gchar*          gst_flow_get_name       (GstFlowReturn ret);
  GQuark                        gst_flow_to_quark       (GstFlowReturn ret);
  
  /**

diff --cc gst/gstplugin.c
index 31a0e44,0fad4d5..68c4d2d
--- 1/gst/gstplugin.c
--- 2/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@@ -1538,7 -1570,7 +1538,7 @@@ gst_plugin_ext_dep_scan_dir_and_match_n
    GDir *dir;
    guint hash = 0;
  
--  recurse_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
++  recurse_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
  
    dir = g_dir_open (path, 0, &err);
    if (dir == NULL) {
@@@ -1600,8 -1632,8 +1600,8 @@@ gst_plugin_ext_dep_scan_path_with_filen
    if (filenames == NULL || *filenames == NULL)
      filenames = empty_filenames;
  
--  recurse_into_dirs = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
--  partial_names = ! !(flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX);
++  recurse_into_dirs = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
++  partial_names = !!(flags & GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX);
  
    /* if we can construct the exact paths to check with the data we have, just
     * stat them one by one; this is more efficient than opening the directory

diff --cc gst/gstplugin.h
Simple merge

diff --cc gst/gstquery.h
Simple merge

diff --cc gst/gststructure.h
index e0e453b,6e020fc..e96799e
--- 1/gst/gststructure.h
--- 2/gst/gststructure.h
+++ b/gst/gststructure.h
@@@ -95,11 -100,11 +95,11 @@@ GstStructure *          gst_structure_i
                                                              GQuark                   field_quark,
                                                              ...);
  GstStructure *          gst_structure_copy                 (const GstStructure      *structure);
 -void                  gst_structure_set_parent_refcount  (GstStructure            *structure,
 -                                                            gint            *refcount);
 +gboolean              gst_structure_set_parent_refcount  (GstStructure            *structure,
 +                                                            gint                    *refcount);
  void                    gst_structure_free                 (GstStructure            *structure);
  
- G_CONST_RETURN gchar *  gst_structure_get_name             (const GstStructure      *structure);
+ const gchar *         gst_structure_get_name             (const GstStructure      *structure);
  GQuark                        gst_structure_get_name_id          (const GstStructure      *structure);
  gboolean                gst_structure_has_name             (const GstStructure      *structure,
                                                            const gchar             *name);

diff --cc gst/gsttaglist.c
Simple merge

diff --cc gst/gsttagsetter.c
Simple merge

diff --cc gst/gstutils.c
Simple merge

diff --cc gst/gstutils.h
Simple merge

diff --cc gst/gstvalue.h
Simple merge