mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-10-04 17:39:17 +02:00
commit 544aa9773a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstquery.c
View file

@ -355,7 +355,7 @@ gst_query_new (GstQueryType type, GstStructure * structure)
query->query.mini_object.copy = (GstMiniObjectCopyFunction) _gst_query_copy; query->query.mini_object.copy = (GstMiniObjectCopyFunction) _gst_query_copy;
query->query.mini_object.free = (GstMiniObjectFreeFunction) _gst_query_free; query->query.mini_object.free = (GstMiniObjectFreeFunction) _gst_query_free;
GST_DEBUG ("creating new query %p %d", query, type); GST_DEBUG ("creating new query %p %s", query, gst_query_type_get_name (type));
GST_QUERY_TYPE (query) = type; GST_QUERY_TYPE (query) = type;
query->structure = structure; query->structure = structure;

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

@ -2798,7 +2798,7 @@ static gboolean
gst_base_parse_activate (GstBaseParse * parse, gboolean active) gst_base_parse_activate (GstBaseParse * parse, gboolean active)
{ {
GstBaseParseClass *klass; GstBaseParseClass *klass;
gboolean result = FALSE; gboolean result = TRUE;
GST_DEBUG_OBJECT (parse, "activate %d", active); GST_DEBUG_OBJECT (parse, "activate %d", active);