mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11

Browse source 
Conflicts:
	tools/gst-inspect.c
This commit is contained in:
Tim-Philipp Müller 2012-01-13 00:22:03 +00:00
commit 66d19b65fb
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gststructure.c
View file

@ -2851,9 +2851,9 @@ wrong_type:
* (as a GType), pointer(s) to a variable(s) to hold the return value(s). * (as a GType), pointer(s) to a variable(s) to hold the return value(s).
* The last variable argument should be NULL. * The last variable argument should be NULL.
* *
* For refcounted (mini)objects you will acquire your own reference which * For refcounted (mini)objects you will receive a new reference which
* you must release with a suitable _unref() when no longer needed. For * you must release with a suitable _unref() when no longer needed. For
* strings and boxed types you will acquire a copy which you will need to * strings and boxed types you will receive a copy which you will need to
* release with either g_free() or the suitable function for the boxed type. * release with either g_free() or the suitable function for the boxed type.
* *
* Returns: FALSE if there was a problem reading any of the fields (e.g. * Returns: FALSE if there was a problem reading any of the fields (e.g.
@ -2896,9 +2896,9 @@ gst_structure_get (const GstStructure * structure, const char *first_fieldname,
* more efficient since it saves the string-to-quark lookup in the global * more efficient since it saves the string-to-quark lookup in the global
* quark hashtable. * quark hashtable.
* *
* For refcounted (mini)objects you will acquire your own reference which * For refcounted (mini)objects you will receive a new reference which
* you must release with a suitable _unref() when no longer needed. For * you must release with a suitable _unref() when no longer needed. For
* strings and boxed types you will acquire a copy which you will need to * strings and boxed types you will receive a copy which you will need to
* release with either g_free() or the suitable function for the boxed type. * release with either g_free() or the suitable function for the boxed type.
* *
* Returns: FALSE if there was a problem reading any of the fields (e.g. * Returns: FALSE if there was a problem reading any of the fields (e.g.

3
libs/gst/base/gstbaseparse.c
View file

@ -785,6 +785,9 @@ gst_base_parse_reset (GstBaseParse * parse)
g_slist_free (parse->priv->pending_seeks); g_slist_free (parse->priv->pending_seeks);
parse->priv->pending_seeks = NULL; parse->priv->pending_seeks = NULL;
if (parse->priv->adapter)
gst_adapter_clear (parse->priv->adapter);
/* we know it is not alloc'ed, but maybe other stuff to free, some day ... */ /* we know it is not alloc'ed, but maybe other stuff to free, some day ... */
parse->priv->frame._private_flags |= parse->priv->frame._private_flags |=
GST_BASE_PARSE_FRAME_PRIVATE_FLAG_NOALLOC; GST_BASE_PARSE_FRAME_PRIVATE_FLAG_NOALLOC;

1
tools/gst-inspect.c
View file

@ -1241,6 +1241,7 @@ print_plugin_features (GstPlugin * plugin)
num_other++; num_other++;
} }
num_features++; num_features++;
gst_object_unref (feature);
features = g_list_next (features); features = g_list_next (features);
} }