From a28d63431ae4ab782b6e866b84690f8da09b27a5 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Thu, 25 Aug 2005 23:17:18 +0000
Subject: [PATCH] gst/gstbin.h: removed ';' from the end of macro defs

Original commit message from CVS:
* gst/gstbin.h:
removed ';' from the end of macro defs
* docs/gst/gstreamer-docs.sgml:
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/.cvsignore:
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_class_init),
(gst_element_set_state), (activate_pads),
(gst_element_save_thyself):
* gst/gstevent.c: (gst_event_new_newsegment):
* gst/gstevent.h:
* gst/gstiterator.c:
* gst/gstiterator.h:
* gst/gstpad.c:
* gst/gstprobe.h:
* gst/gstutils.c: (gst_pad_query_convert):
* gst/gstutils.h:
fixed parameter name mismatches between source, header and docs
added some more docs, resolved the last batch of unused elements in
docs (now someone needs to doc them)
---
 ChangeLog                       |  23 ++++
 docs/gst/gstreamer-docs.sgml    |   2 +
 docs/gst/gstreamer-sections.txt | 275 ++++++++++++++++++++++++++++++++++------
 docs/gst/tmpl/.gitignore        |   2 +
 gst/gstbin.h                    |   6 +-
 gst/gstbus.h                    |  22 ++++
 gst/gstelement.c                |  31 +++--
 gst/gstevent.c                  |  20 +--
 gst/gstevent.h                  |   6 +-
 gst/gstiterator.c               |   2 +-
 gst/gstiterator.h               |   2 +-
 gst/gstpad.c                    |  14 +-
 gst/gstprobe.h                  |   2 +-
 gst/gstutils.c                  |  17 ++-
 gst/gstutils.h                  |   2 +-
 15 files changed, 334 insertions(+), 92 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1395952..445c360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2005-08-26  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gstbin.h:
+          removed ';' from the end of macro defs
+	* docs/gst/gstreamer-docs.sgml:
+	* docs/gst/gstreamer-sections.txt:
+	* docs/gst/tmpl/.cvsignore:
+	* gst/gstbus.h:
+	* gst/gstelement.c: (gst_element_class_init),
+	(gst_element_set_state), (activate_pads),
+	(gst_element_save_thyself):
+	* gst/gstevent.c: (gst_event_new_newsegment):
+	* gst/gstevent.h:
+	* gst/gstiterator.c:
+	* gst/gstiterator.h:
+	* gst/gstpad.c:
+	* gst/gstprobe.h:
+	* gst/gstutils.c: (gst_pad_query_convert):
+	* gst/gstutils.h:
+          fixed parameter name mismatches between source, header and docs
+          added some more docs, resolved the last batch of unused elements in
+          docs (now someone needs to doc them)
+
 2005-08-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/registries/gstlibxmlregistry.c: (gst_xml_registry_rebuild):
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index d9a8269..172c978 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -8,6 +8,7 @@
 <!ENTITY GstBuffer SYSTEM "xml/gstbuffer.xml">
 <!ENTITY GstBus SYSTEM "xml/gstbus.xml">
 <!ENTITY GstCaps SYSTEM "xml/gstcaps.xml">
+<!ENTITY GstCheck SYSTEM "xml/gstcheck.xml">
 <!ENTITY GstChildProxy SYSTEM "xml/gstchildproxy.xml">
 <!ENTITY GstClock SYSTEM "xml/gstclock.xml">
 <!--
@@ -108,6 +109,7 @@
     &GstBuffer;
     &GstBus;
     &GstCaps;
+    &GstCheck;
     &GstChildProxy;
     &GstClock;
     &GstConfig;
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index a4f218b..ed501ba 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1,6 +1,7 @@
 # GStreamer API reference sections
 
 # please add sections in alphabetical order using the following template
+# leave two empty lines between sections
 # <SECTION>
 # <FILE>gstxxx</FILE>
 # <TITLE>GstXxx</TITLE>
@@ -14,6 +15,7 @@
 
 <INCLUDE>gst/gst.h</INCLUDE>
 
+
 <SECTION>
 <FILE>gst</FILE>
 <TITLE>Gst</TITLE>
@@ -24,9 +26,14 @@ gst_init_check_with_popt_table
 gst_init_get_popt_table
 gst_deinit
 <SUBSECTION Private>
-#GstPoptOption
+GstPoptOption
+mutex
+start_cond
+sync_cond
+thread_list
 </SECTION>
 
+
 <SECTION>
 <FILE>gstbin</FILE>
 <TITLE>GstBin</TITLE>
@@ -67,9 +74,9 @@ GST_BIN_CAST
 <SUBSECTION Private>
 gst_bin_get_type
 gst_bin_flags_get_type
-
 </SECTION>
 
+
 <SECTION>
 <FILE>gstbus</FILE>
 <TITLE>GstBus</TITLE>
@@ -106,6 +113,7 @@ gst_bus_flags_get_type
 gst_bus_sync_reply_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstbuffer</FILE>
 <TITLE>GstBuffer</TITLE>
@@ -169,6 +177,7 @@ gst_buffer_get_type
 gst_buffer_flag_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstcaps</FILE>
 <TITLE>GstCaps</TITLE>
@@ -230,6 +239,49 @@ GST_TYPE_CAPS
 gst_caps_get_type
 </SECTION>
 
+
+<SECTION>
+<FILE>gstcheck</FILE>
+<TITLE>GstCheck</TITLE>
+ASSERT_BUFFER_REFCOUNT
+ASSERT_CAPS_REFCOUNT
+ASSERT_CRITICAL
+ASSERT_MINI_OBJECT_REFCOUNT
+ASSERT_OBJECT_REFCOUNT
+ASSERT_OBJECT_REFCOUNT_BETWEEN
+MAIN_INIT
+MAIN_START_THREADS
+MAIN_START_THREAD_FUNCTION
+MAIN_START_THREAD_FUNCTIONS
+MAIN_STOP_THREADS
+MAIN_SYNCHRONIZE
+THREAD_START
+THREAD_STARTED
+THREAD_SWITCH
+THREAD_SYNCHRONIZE
+THREAD_TEST_RUNNING
+GST_START_TEST
+GST_END_TEST
+
+fail_unless_equals_int
+fail_unless_equals_string
+fail_unless_equals_uint64
+fail_unless_message_error
+
+gst_check_chain_func
+gst_check_init
+gst_check_message_error
+gst_check_setup_element
+gst_check_setup_sink_pad
+gst_check_setup_src_pad
+gst_check_teardown_element
+gst_check_teardown_sink_pad
+gst_check_teardown_src_pad
+
+<SUBSECTION Private>
+</SECTION>
+
+
 <SECTION>
 <FILE>gstchildproxy</FILE>
 <TITLE>GstChildProxy</TITLE>
@@ -256,6 +308,7 @@ GST_TYPE_CHILD_PROXY
 gst_child_proxy_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstclock</FILE>
 <TITLE>GstClock</TITLE>
@@ -272,6 +325,8 @@ GST_NSECOND
 GST_CLOCK_DIFF
 GST_TIMEVAL_TO_TIME
 GST_TIME_TO_TIMEVAL
+GST_TIMESPEC_TO_TIME
+GST_TIME_TO_TIMESPEC
 GST_CLOCK_ENTRY_TRACE_NAME
 GstClockEntry
 GstClockCallback
@@ -323,6 +378,7 @@ gst_clock_flags_get_type
 gst_clock_return_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstcompat</FILE>
 <TITLE>GstCompat</TITLE>
@@ -330,6 +386,7 @@ gst_clock_return_get_type
 <SUBSECTION Private>
 </SECTION>
 
+
 <SECTION>
 <FILE>gstconfig</FILE>
 <SUBSECTION Private>
@@ -349,11 +406,13 @@ GST_EXPORT
 GST_PLUGIN_EXPORT
 </SECTION>
 
+
 <SECTION>
 <FILE>gstelement</FILE>
 <TITLE>GstElement</TITLE>
 GstElement
 GstElementClass
+GstElementFlags
 GST_NUM_STATES
 GST_STATE
 GST_STATE_PENDING
@@ -364,52 +423,92 @@ GST_STATE_PAUSED_TO_PLAYING
 GST_STATE_PLAYING_TO_PAUSED
 GST_STATE_PAUSED_TO_READY
 GST_STATE_READY_TO_NULL
-GstElementFlags
+GST_STATE_BROADCAST
+GST_STATE_ERROR
+GST_STATE_FINAL
+GST_STATE_GET_COND
+GST_STATE_GET_LOCK
+GST_STATE_LOCK
+GST_STATE_NO_PREROLL
+GST_STATE_SIGNAL
+GST_STATE_TIMED_WAIT
+GST_STATE_TRYLOCK
+GST_STATE_UNLOCK
+GST_STATE_WAIT
 GST_ELEMENT_NAME
 GST_ELEMENT_PARENT
 GST_ELEMENT_CLOCK
 GST_ELEMENT_PADS
 GST_ELEMENT_ERROR
+GST_ELEMENT_BUS
+GST_ELEMENT_WARNING
+GST_ELEMENT_IS_LOCKED_STATE
+
+gst_element_abort_preroll
+gst_element_abort_state
+gst_element_add_pad
 gst_element_class_add_pad_template
+gst_element_class_get_pad_template
+gst_element_class_get_pad_template_list
 gst_element_class_install_std_props
 gst_element_class_set_details
-gst_element_get_name
-gst_element_set_name
-gst_element_get_parent
-gst_element_set_parent
-gst_element_requires_clock
-gst_element_provides_clock
+gst_element_commit_state
+gst_element_create_all_pads
+gst_element_factory_can_sink_caps
+gst_element_factory_can_src_caps
+gst_element_factory_get_static_pad_templates
+gst_element_finish_preroll
+gst_element_found_tags
+gst_element_found_tags_for_pad
+gst_element_get_base_time
+gst_element_get_bus
 gst_element_get_clock
-gst_element_set_clock
-gst_element_is_indexable
-gst_element_set_index
+gst_element_get_compatible_pad
+gst_element_get_compatible_pad_template
+gst_element_get_factory
 gst_element_get_index
-gst_element_add_pad
-gst_element_remove_pad
+gst_element_get_name
 gst_element_get_pad
-gst_element_get_static_pad
+gst_element_get_parent
+gst_element_get_query_types
 gst_element_get_request_pad
-gst_element_release_request_pad
-gst_element_get_compatible_pad
-gst_element_get_compatible_pad_template
+gst_element_get_state
+gst_element_get_static_pad
+gst_element_is_indexable
+gst_element_is_locked_state
+gst_element_iterate_pads
+gst_element_iterate_sink_pads
+gst_element_iterate_src_pads
 gst_element_link
 gst_element_link_many
-gst_element_unlink
-gst_element_unlink_many
 gst_element_link_pads
-gst_element_unlink_pads
-gst_element_send_event
-gst_element_seek
-gst_element_get_query_types
+gst_element_link_pads_filtered
+gst_element_lost_state
+gst_element_message_full
+gst_element_no_more_pads
+gst_element_post_message
+gst_element_provides_clock
 gst_element_query
-gst_element_is_locked_state
+gst_element_query_convert
+gst_element_query_position
+gst_element_release_request_pad
+gst_element_remove_pad
+gst_element_requires_clock
+gst_element_seek
+gst_element_send_event
+gst_element_set_base_time
+gst_element_set_bus
+gst_element_set_clock
+gst_element_set_index
 gst_element_set_locked_state
-gst_element_sync_state_with_parent
-gst_element_get_state
+gst_element_set_name
+gst_element_set_parent
 gst_element_set_state
 gst_element_state_get_name
-gst_element_get_factory
-gst_element_no_more_pads
+gst_element_sync_state_with_parent
+gst_element_unlink
+gst_element_unlink_many
+gst_element_unlink_pads
 <SUBSECTION Standard>
 GST_ELEMENT
 GST_IS_ELEMENT
@@ -424,6 +523,7 @@ gst_element_get_type
 gst_element_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstelementdetails</FILE>
 <TITLE>GstElementDetails</TITLE>
@@ -433,6 +533,7 @@ GST_ELEMENT_DETAILS
 GST_IS_ELEMENT_DETAILS
 </SECTION>
 
+
 <SECTION>
 <FILE>gstelementfactory</FILE>
 <TITLE>GstElementFactory</TITLE>
@@ -460,6 +561,7 @@ GST_TYPE_ELEMENT_FACTORY
 gst_element_factory_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsterror</FILE>
 <TITLE>GstGError</TITLE>
@@ -491,6 +593,7 @@ gst_resource_error_get_type
 gst_stream_error_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstevent</FILE>
 <TITLE>GstEvent</TITLE>
@@ -507,6 +610,9 @@ GstSeekType
 GstSeekFlags
 
 GST_EVENT_MAKE_TYPE
+GST_EVDIR_BOTH
+GST_EVDIR_DS
+GST_EVDIR_US
 
 gst_event_ref
 gst_event_unref
@@ -538,12 +644,15 @@ GST_TYPE_EVENT_TYPE
 GST_TYPE_SEEK_TYPE
 GST_TYPE_SEEK_FLAGS
 <SUBSECTION Private>
+GST_EVSER
+GST_EVSHIFT
 gst_event_get_type
 gst_event_type_get_type
 gst_seek_type_get_type
 gst_seek_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstfilter</FILE>
 <TITLE>GstFilter</TITLE>
@@ -551,6 +660,7 @@ GstFilterFunc
 gst_filter_run
 </SECTION>
 
+
 <SECTION>
 <FILE>gstformat</FILE>
 <TITLE>GstFormat</TITLE>
@@ -570,6 +680,7 @@ GST_TYPE_FORMAT
 gst_format_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstghostpad</FILE>
 <TITLE>GstGhostPad</TITLE>
@@ -589,6 +700,7 @@ GST_TYPE_GHOST_PAD
 gst_ghost_pad_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstindex</FILE>
 <TITLE>GstIndex</TITLE>
@@ -659,6 +771,7 @@ gst_index_lookup_method_get_type
 gst_index_resolver_method_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstindexfactory</FILE>
 <TITLE>GstIndexFactory</TITLE>
@@ -680,6 +793,7 @@ GST_TYPE_INDEX_FACTORY
 gst_index_factory_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstinfo</FILE>
 <TITLE>GstInfo</TITLE>
@@ -691,6 +805,7 @@ GST_STR_NULL
 GST_DEBUG_PAD_NAME
 GST_FUNCTION
 GstDebugMessage
+GstDebugFuncPtr
 GstLogFunction
 gst_debug_log
 gst_debug_log_valist
@@ -761,6 +876,7 @@ gst_debug_color_flags_get_type
 gst_debug_level_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstimplementsinterface</FILE>
 <TITLE>GstImplementsInterface</TITLE>
@@ -782,6 +898,7 @@ GST_TYPE_IMPLEMENTS_INTERFACE
 gst_implements_interface_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstiterator</FILE>
 <TITLE>GstIterator</TITLE>
@@ -814,7 +931,6 @@ gst_iterator_fold
 gst_iterator_foreach
 gst_iterator_find_custom
 
-
 <SUBSECTION Standard>
 GST_TYPE_ITERATOR_ITEM
 GST_TYPE_ITERATOR_RESULT
@@ -823,6 +939,7 @@ gst_iterator_item_get_type
 gst_iterator_result_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstmacros</FILE>
 <TITLE>GstMacros</TITLE>
@@ -832,6 +949,7 @@ GST_INLINE_FUNC
 GST_CAN_INLINE
 </SECTION>
 
+
 <SECTION>
 <FILE>gstmemchunk</FILE>
 <TITLE>GstMemChunk</TITLE>
@@ -843,6 +961,7 @@ gst_mem_chunk_alloc0
 gst_mem_chunk_free
 </SECTION>
 
+
 <SECTION>
 <FILE>gstmessage</FILE>
 <TITLE>GstMessage</TITLE>
@@ -860,7 +979,6 @@ GST_MESSAGE_UNLOCK
 GST_MESSAGE_WAIT
 gst_message_copy
 gst_message_get_structure
-gst_message_get_type
 gst_message_make_writable
 gst_message_new_application
 gst_message_new_custom
@@ -893,6 +1011,7 @@ GST_TYPE_MESSAGE_TYPE
 gst_message_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstminiobject</FILE>
 <TITLE>GstMiniObject</TITLE>
@@ -937,6 +1056,7 @@ gst_mini_object_get_type
 gst_mini_object_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstobject</FILE>
 <TITLE>GstObject</TITLE>
@@ -957,6 +1077,10 @@ GST_OBJECT_IS_DISPOSING
 GST_OBJECT_IS_FLOATING
 GST_OBJECT_REFCOUNT
 GST_OBJECT_REFCOUNT_VALUE
+GST_CLASS_GET_LOCK
+GST_CLASS_LOCK
+GST_CLASS_TRYLOCK
+GST_CLASS_UNLOCK
 
 gst_object_set_name
 gst_object_get_name
@@ -994,6 +1118,7 @@ gst_object_flags_get_type
 xmlNodePtr
 </SECTION>
 
+
 <SECTION>
 <FILE>gstpad</FILE>
 <TITLE>GstPad</TITLE>
@@ -1022,6 +1147,25 @@ GstPadDirection
 GstPadFlags
 GstPadLinkReturn
 GstPadPresence
+GstFlowReturn
+GstActivateMode
+
+GST_PREROLL_BROADCAST
+GST_PREROLL_GET_COND
+GST_PREROLL_GET_LOCK
+GST_PREROLL_LOCK
+GST_PREROLL_SIGNAL
+GST_PREROLL_TIMED_WAIT
+GST_PREROLL_TRYLOCK
+GST_PREROLL_UNLOCK
+GST_PREROLL_WAIT
+GST_STREAM_GET_LOCK
+GST_STREAM_LOCK
+GST_STREAM_LOCK_FULL
+GST_STREAM_TRYLOCK
+GST_STREAM_UNLOCK
+GST_STREAM_UNLOCK_FULL
+GST_FLOW_IS_FATAL
 
 gst_pad_new
 gst_pad_new_from_template
@@ -1111,6 +1255,7 @@ gst_pad_add_event_probe
 gst_pad_remove_data_probe
 gst_pad_remove_buffer_probe
 gst_pad_remove_event_probe
+
 <SUBSECTION Standard>
 GstPadClass
 GST_PAD
@@ -1122,6 +1267,8 @@ GST_TYPE_PAD_DIRECTION
 GST_TYPE_PAD_FLAGS
 GST_TYPE_PAD_LINK_RETURN
 GST_TYPE_PAD_PRESENCE
+GST_TYPE_FLOW_RETURN
+GST_TYPE_ACTIVATE_MODE
 
 <SUBSECTION Private>
 gst_pad_get_type
@@ -1129,6 +1276,8 @@ gst_pad_direction_get_type
 gst_pad_flags_get_type
 gst_pad_link_return_get_type
 gst_pad_presence_get_type
+gst_flow_return_get_type
+gst_activate_mode_get_type
 
 GST_PAD_NAME
 GST_PAD_PARENT
@@ -1176,9 +1325,9 @@ GST_PAD_QUERYFUNC
 GST_PAD_QUERYTYPEFUNC
 GST_PAD_SETCAPSFUNC
 GST_PAD_UNLINKFUNC
-
 </SECTION>
 
+
 <SECTION>
 <FILE>gstpadtemplate</FILE>
 <TITLE>GstPadTemplate</TITLE>
@@ -1193,6 +1342,7 @@ GST_PAD_TEMPLATE_IS_FIXED
 GstPadTemplateFlags
 gst_pad_template_new
 gst_static_pad_template_get
+gst_static_pad_template_get_caps
 gst_pad_template_get_caps
 <SUBSECTION Standard>
 GstPadTemplateClass
@@ -1208,6 +1358,7 @@ gst_pad_template_get_type
 gst_pad_template_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstparse</FILE>
 <TITLE>GstParse</TITLE>
@@ -1222,6 +1373,7 @@ GST_TYPE_PARSE_ERROR
 gst_parse_error_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstpipeline</FILE>
 <TITLE>GstPipeline</TITLE>
@@ -1252,6 +1404,7 @@ gst_pipeline_get_type
 gst_pipeline_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstplugin</FILE>
 <TITLE>GstPlugin</TITLE>
@@ -1295,6 +1448,7 @@ gst_plugin_get_type
 gst_plugin_error_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstpluginfeature</FILE>
 <TITLE>GstPluginFeature</TITLE>
@@ -1321,6 +1475,7 @@ GST_TYPE_PLUGIN_FEATURE
 gst_plugin_feature_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstprobe</FILE>
 <TITLE>GstProbe</TITLE>
@@ -1394,6 +1549,7 @@ gst_query_get_type
 gst_query_type_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstqueue</FILE>
 <TITLE>GstQueue</TITLE>
@@ -1459,6 +1615,7 @@ gst_registry_flags_get_type
 gst_registry_return_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstregistrypool</FILE>
 <TITLE>GstRegistryPool</TITLE>
@@ -1476,11 +1633,13 @@ gst_registry_pool_find_feature
 gst_registry_pool_get_prefered
 </SECTION>
 
+
 <SECTION>
 <FILE>gststructure</FILE>
 <TITLE>GstStructure</TITLE>
 GstStructure
 GstStructureForeachFunc
+GstStructureMapFunc
 gst_structure_empty_new
 gst_structure_id_empty_new
 gst_structure_new
@@ -1511,6 +1670,9 @@ gst_structure_get_int
 gst_structure_get_fourcc
 gst_structure_get_double
 gst_structure_get_string
+gst_structure_map_in_place
+gst_structure_nth_field_name
+gst_structure_set_parent_refcount
 gst_structure_to_string
 gst_structure_from_string
 gst_caps_structure_fixate_field_nearest_int
@@ -1523,6 +1685,7 @@ GST_TYPE_STRUCTURE
 gst_structure_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstsystemclock</FILE>
 <TITLE>GstSystemClock</TITLE>
@@ -1539,6 +1702,7 @@ GST_SYSTEM_CLOCK_GET_CLASS
 GST_TYPE_SYSTEM_CLOCK
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttaglist</FILE>
 <TITLE>GstTagList</TITLE>
@@ -1649,6 +1813,7 @@ gst_tag_flag_get_type
 gst_tag_merge_mode_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttagsetter</FILE>
 <TITLE>GstTagSetter</TITLE>
@@ -1672,6 +1837,7 @@ GST_TYPE_TAG_SETTER
 gst_tag_setter_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttask</FILE>
 <TITLE>GstTask</TITLE>
@@ -1682,22 +1848,20 @@ GstTaskState
 GST_TASK_BROADCAST
 GST_TASK_GET_COND
 GST_TASK_GET_LOCK
-GST_TASK_LOCK
-GST_TASK_LOCK_FULL
 GST_TASK_SIGNAL
 GST_TASK_STATE
-GST_TASK_UNLOCK
-GST_TASK_UNLOCK_FULL
 GST_TASK_WAIT
 
+gst_task_cleanup_all
 gst_task_create
 gst_task_get_state
 gst_task_get_type
+gst_task_join
 gst_task_pause
 gst_task_set_lock
 gst_task_start
-gst_task_state_get_type
 gst_task_stop
+
 <SUBSECTION Standard>
 GstTaskClass
 GST_TASK
@@ -1710,8 +1874,10 @@ GST_TASK_CAST
 GST_TYPE_TASK_STATE
 <SUBSECTION Private>
 gst_task_get_type
+gst_task_state_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttrace</FILE>
 <TITLE>GstTrace</TITLE>
@@ -1735,6 +1901,7 @@ gst_alloc_trace_print_all
 gst_alloc_trace_set_flags_all
 gst_alloc_trace_get
 gst_alloc_trace_print
+gst_alloc_trace_print_live
 gst_alloc_trace_set_flags
 gst_alloc_trace_register
 gst_alloc_trace_new
@@ -1746,6 +1913,7 @@ GST_TYPE_ALLOC_TRACE_FLAGS
 gst_alloc_trace_flags_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttrashstack</FILE>
 <TITLE>GstTrashStack</TITLE>
@@ -1756,6 +1924,7 @@ gst_vgulong
 SMP_LOCK
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttypefind</FILE>
 <TITLE>GstTypeFind</TITLE>
@@ -1772,6 +1941,7 @@ GST_TYPE_TYPE_FIND_PROBABILITY
 gst_type_find_probability_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttypefindfactory</FILE>
 <TITLE>GstTypeFindFactory</TITLE>
@@ -1792,6 +1962,7 @@ GST_TYPE_TYPE_FIND_FACTORY
 gst_type_find_factory_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsttypes</FILE>
 <TITLE>GstTypes</TITLE>
@@ -1810,6 +1981,7 @@ gst_element_state_return_get_type
 gst_rank_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsturihandler</FILE>
 <TITLE>GstUriHandler</TITLE>
@@ -1837,6 +2009,7 @@ GST_TYPE_URI_HANDLER
 gst_uri_handler_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gsturitype</FILE>
 <TITLE>GstUriType</TITLE>
@@ -1849,6 +2022,7 @@ gst_uri_get_uri_type
 gst_uri_type_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstutils</FILE>
 <TITLE>GstUtils</TITLE>
@@ -1878,16 +2052,19 @@ GST_ROUND_UP_16
 GST_ROUND_UP_32
 GST_ROUND_UP_64
 
-gst_util_set_value_from_string
-gst_util_set_object_arg
-gst_util_dump_mem
-gst_print_pad_caps
-gst_print_element_args
+gst_atomic_int_set
 gst_bin_watch_for_state_change
+gst_flow_get_name
+gst_print_element_args
+gst_print_pad_caps
+gst_util_dump_mem
+gst_util_set_object_arg
+gst_util_set_value_from_string
 <SUBSECTION Private>
 GST_HAVE_UNALIGNED_ACCESS
 </SECTION>
 
+
 <SECTION>
 <FILE>gstvalue</FILE>
 <TITLE>GstValue</TITLE>
@@ -1907,6 +2084,7 @@ GST_VALUE_LESS_THAN
 GST_VALUE_EQUAL
 GST_VALUE_GREATER_THAN
 GST_VALUE_UNORDERED
+
 GstValueCompareFunc
 GstValueSerializeFunc
 GstValueDeserializeFunc
@@ -1914,6 +2092,7 @@ GstValueUnionFunc
 GstValueIntersectFunc
 GstValueSubtractFunc
 GstValueTable
+
 gst_value_is_fixed
 gst_value_register
 gst_value_init_and_copy
@@ -1937,6 +2116,9 @@ gst_value_set_caps
 gst_value_get_fraction_numerator
 gst_value_get_fraction_denominator
 gst_value_set_fraction
+gst_value_get_buffer
+gst_value_set_buffer
+gst_value_take_buffer
 gst_value_fraction_multiply
 gst_value_compare
 gst_value_can_compare
@@ -1955,8 +2137,10 @@ GST_TYPE_INT_RANGE
 GST_TYPE_DOUBLE_RANGE
 GST_TYPE_LIST
 GST_TYPE_FRACTION
+GST_TYPE_ARRAY
 </SECTION>
 
+
 <SECTION>
 <FILE>gstversion</FILE>
 <TITLE>GstVersion</TITLE>
@@ -1966,6 +2150,7 @@ GST_VERSION_MICRO
 gst_version
 </SECTION>
 
+
 <SECTION>
 <FILE>gstxml</FILE>
 <TITLE>GstXML</TITLE>
@@ -2000,6 +2185,7 @@ GST_TYPE_XML
 gst_xml_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstxmlregistry</FILE>
 <TITLE>GstXMLRegistry</TITLE>
@@ -2017,11 +2203,13 @@ GST_TYPE_XML_REGISTRY
 gst_xml_registry_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstenumtypes</FILE>
 <TITLE>GstEnumTypes</TITLE>
 </SECTION>
 
+
 # base classes
 
 <SECTION>
@@ -2209,6 +2397,7 @@ GST_IS_FAKE_SRC_CLASS
 gst_fake_src_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstfakesink</FILE>
 <TITLE>GstFakeSink</TITLE>
@@ -2226,6 +2415,7 @@ GST_IS_FAKE_SINK_CLASS
 gst_fake_sink_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstfilesrc</FILE>
 <TITLE>GstFileSrc</TITLE>
@@ -2242,6 +2432,7 @@ GST_IS_FILE_SRC_CLASS
 gst_file_src_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>gstfilesink</FILE>
 <TITLE>GstFileSink</TITLE>
diff --git a/docs/gst/tmpl/.gitignore b/docs/gst/tmpl/.gitignore
index 7a20866..f66142e 100644
--- a/docs/gst/tmpl/.gitignore
+++ b/docs/gst/tmpl/.gitignore
@@ -8,6 +8,7 @@ gstbasetransform.sgml
 gstbin.sgml
 gstbuffer.sgml
 gstbus.sgml
+gstcheck.sgml
 gstcollectpads.sgml
 gstevent.sgml
 gstfakesrc.sgml
@@ -15,6 +16,7 @@ gstfakesink.sgml
 gstfilesrc.sgml
 gstfilesink.sgml
 gstmessage.sgml
+gstminiobject.sgml
 gstprobe.sgml
 gstpushsrc.sgml
 gsttask.sgml
diff --git a/gst/gstbin.h b/gst/gstbin.h
index 30aeaf6..7786b08 100644
--- a/gst/gstbin.h
+++ b/gst/gstbin.h
@@ -65,7 +65,7 @@ typedef struct _GstBinClass GstBinClass;
  *
  * Returns: the number of child objects
  */
-#define GST_BIN_NUMCHILDREN(bin)	(GST_BIN_CAST(bin)->numchildren);
+#define GST_BIN_NUMCHILDREN(bin)	(GST_BIN_CAST(bin)->numchildren)
 /**
  * GST_BIN_CHILDREN:
  * @bin: the bin to get the list with children from
@@ -74,7 +74,7 @@ typedef struct _GstBinClass GstBinClass;
  *
  * Returns: the children list
  */
-#define GST_BIN_CHILDREN(bin)		(GST_BIN_CAST(bin)->children);
+#define GST_BIN_CHILDREN(bin)		(GST_BIN_CAST(bin)->children)
 /**
  * GST_BIN_CHILDREN_COOKIE:
  * @bin: the bin to get the children cookie from 
@@ -83,7 +83,7 @@ typedef struct _GstBinClass GstBinClass;
  *
  * Returns: the children cookie
  */
-#define GST_BIN_CHILDREN_COOKIE(bin)	(GST_BIN_CAST(bin)->children_cookie);
+#define GST_BIN_CHILDREN_COOKIE(bin)	(GST_BIN_CAST(bin)->children_cookie)
 
 struct _GstBin {
   GstElement	 element;
diff --git a/gst/gstbus.h b/gst/gstbus.h
index 90adf59..f57430d 100644
--- a/gst/gstbus.h
+++ b/gst/gstbus.h
@@ -52,7 +52,29 @@ typedef enum
   GST_BUS_ASYNC = 2,            /* pass message to async queue, continue if message is handled */
 } GstBusSyncReply;
 
+/**
+ * GstBusSyncHandler:
+ * @bus: the #GstBus that sent the message
+ * @messages: the #GstMessage
+ * @data: user data that has been given, when registering the handler
+ *
+ * Handler will be invoked synchronously, when a new message has been injected
+ * into the bus.
+ *
+ * Returns: #GstBusSyncReply stating what to do with the message
+ */
 typedef GstBusSyncReply (*GstBusSyncHandler) 	(GstBus * bus, GstMessage * message, gpointer data);
+/**
+ * GstBusHandler:
+ * @bus: the #GstBus that sent the message
+ * @messages: the #GstMessage
+ * @data: user data that has been given, when registering the handler
+ *
+ * Handler will be invoked asynchronously, after a new message has been injected
+ * into the bus.
+ *
+ * Returns: %TRUE if message should be taken from the bus
+ */
 typedef gboolean 	(*GstBusHandler) 	(GstBus * bus, GstMessage * message, gpointer data);
 
 struct _GstBus
diff --git a/gst/gstelement.c b/gst/gstelement.c
index a632f86..a49d8f4 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -116,8 +116,8 @@ gst_element_class_init (GstElementClass * klass)
   /**
    * GstElement::state-changed:
    * @gstelement: the object which received the signal
-   * @int:
-   * @int:
+   * @old_state: the GST_STATE_XXX before the change
+   * @new_state: the GST_STATE_XXX after the change
    *
    * the #GstElementState of the element has been changed
    */
@@ -128,7 +128,7 @@ gst_element_class_init (GstElementClass * klass)
   /**
    * GstElement::pad-added:
    * @gstelement: the object which received the signal
-   * @object:
+   * @new_pad: the pad that has been added
    *
    * a new #GstPad has been added to the element
    */
@@ -139,7 +139,7 @@ gst_element_class_init (GstElementClass * klass)
   /**
    * GstElement::pad-removed:
    * @gstelement: the object which received the signal
-   * @object:
+   * @old_pad: the pad that has been removed
    *
    * a #GstPad has been removed from the element
    */
@@ -151,7 +151,7 @@ gst_element_class_init (GstElementClass * klass)
    * GstElement::no-more-pads:
    * @gstelement: the object which received the signal
    *
-   * ?
+   * This signals that the element will not generate more dynamic pads.
    */
   gst_element_signals[NO_MORE_PADS] =
       g_signal_new ("no-more-pads", G_TYPE_FROM_CLASS (klass),
@@ -1140,14 +1140,17 @@ gst_element_send_event (GstElement * element, GstEvent * event)
 /**
  * gst_element_seek:
  * @element: a #GstElement to send the event to.
- * @seek_method: the method to use for seeking (GST_SEEK_METHOD_*).
- * @seek_format: the #GstFormat to use for seeking (GST_FORMAT_*).
- * @seek_flags: the flags to use for seeking (GST_SEEK_FLAG_*).
- * @offset: the offset to seek to (in the given seek_format).
+ * @rate: The new playback rate
+ * @format: The format of the seek values
+ * @flags: The optional seek flags.
+ * @cur_type: The type and flags for the new current position
+ * @cur: The value of the new current position
+ * @stop_type: The type and flags for the new stop position
+ * @stop: The value of the new stop position
  *
  * Sends a seek event to an element.
  *
- * Returns: TRUE if the event was handled.
+ * Returns: %TRUE if the event was handled.
  *
  * MT safe.
  */
@@ -1765,6 +1768,7 @@ gst_element_set_state (GstElement * element, GstElementState state)
   GstElementState pending;
   GTimeVal tv;
 
+  g_return_val_if_fail (GST_IS_ELEMENT (element), GST_STATE_FAILURE);
 
   /* get current element state,  need to call the method so that
    * we call the virtual method and subclasses can implement their
@@ -1778,6 +1782,7 @@ gst_element_set_state (GstElement * element, GstElementState state)
   GST_STATE_FINAL (element) = state;
   if (ret == GST_STATE_ASYNC) {
     gst_element_commit_state (element);
+    gst_element_lost_state (element);
   }
 
   /* start with the current state */
@@ -1887,6 +1892,8 @@ activate_pads (GstPad * pad, GValue * ret, gboolean * active)
 {
   if (!gst_pad_set_active (pad, *active))
     g_value_set_boolean (ret, FALSE);
+  else if (!*active)
+    gst_pad_set_caps (pad, NULL);
 
   gst_object_unref (pad);
   return TRUE;
@@ -2120,10 +2127,6 @@ gst_element_save_thyself (GstObject * object, xmlNodePtr parent)
         (xmlChar *) GST_PLUGIN_FEATURE (factory)->name);
   }
 
-/* FIXME: what is this? */
-/*  if (element->manager) */
-/*    xmlNewChild(parent, NULL, "manager", GST_ELEMENT_NAME(element->manager)); */
-
   /* params */
   specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (object), &nspecs);
 
diff --git a/gst/gstevent.c b/gst/gstevent.c
index 09d01e3..7618988 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -279,8 +279,8 @@ gst_event_new_eos (void)
  * gst_event_new_newsegment:
  * @rate: a new rate for playback
  * @format: The format of the segment values
- * @start_val: the start value of the segment
- * @stop_val: the stop value of the segment
+ * @start_value: the start value of the segment
+ * @stop_value: the stop value of the segment
  * @base: base value for buffer timestamps.
  *
  * Allocate a new newsegment event with the given format/values tripplets.
@@ -299,30 +299,30 @@ gst_event_new_eos (void)
  */
 GstEvent *
 gst_event_new_newsegment (gdouble rate, GstFormat format,
-    gint64 start_val, gint64 stop_val, gint64 base)
+    gint64 start_value, gint64 stop_value, gint64 base)
 {
   if (format == GST_FORMAT_TIME) {
     GST_CAT_INFO (GST_CAT_EVENT,
         "creating newsegment rate %lf, format GST_FORMAT_TIME, "
         "start %" GST_TIME_FORMAT ", stop %" GST_TIME_FORMAT
         ", base %" GST_TIME_FORMAT,
-        rate, GST_TIME_ARGS (start_val),
-        GST_TIME_ARGS (stop_val), GST_TIME_ARGS (base));
+        rate, GST_TIME_ARGS (start_value),
+        GST_TIME_ARGS (stop_value), GST_TIME_ARGS (base));
   } else {
     GST_CAT_INFO (GST_CAT_EVENT,
         "creating newsegment rate %lf, format %d, "
         "start %lld, stop %lld, base %lld",
-        rate, format, start_val, stop_val, base);
+        rate, format, start_value, stop_value, base);
   }
 
-  if (start_val != -1 && stop_val != -1)
-    g_return_val_if_fail (start_val < stop_val, NULL);
+  if (start_value != -1 && stop_value != -1)
+    g_return_val_if_fail (start_value < stop_value, NULL);
 
   return gst_event_new_custom (GST_EVENT_NEWSEGMENT,
       gst_structure_new ("GstEventNewsegment", "rate", G_TYPE_DOUBLE, rate,
           "format", GST_TYPE_FORMAT, format,
-          "start_val", G_TYPE_INT64, start_val,
-          "stop_val", G_TYPE_INT64, stop_val,
+          "start_val", G_TYPE_INT64, start_value,
+          "stop_val", G_TYPE_INT64, stop_value,
           "base", G_TYPE_INT64, base, NULL));
 }
 
diff --git a/gst/gstevent.h b/gst/gstevent.h
index e90cdfd..82384b1 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -272,11 +272,11 @@ GstEvent *	gst_event_new_flush_stop	(void);
 GstEvent *	gst_event_new_eos		(void);
 
 /* newsegment events */
-GstEvent*	gst_event_new_newsegment	(gdouble rate,
-						 GstFormat format, gint64 start_value, gint64 stop_value,
+GstEvent*	gst_event_new_newsegment	(gdouble rate, GstFormat format,
+                                                 gint64 start_value, gint64 stop_value,
 						 gint64 base);
 void		gst_event_parse_newsegment	(GstEvent *event, gdouble *rate, GstFormat *format, 
-						 gint64 *start_value, gint64 *end_value, gint64 *base);
+						 gint64 *start_value, gint64 *stop_value, gint64 *base);
 /* tag event */
 GstEvent*	gst_event_new_tag		(GstTagList *taglist);
 void		gst_event_parse_tag		(GstEvent *event, GstTagList **taglist);
diff --git a/gst/gstiterator.c b/gst/gstiterator.c
index 2a96541..f5b05cc 100644
--- a/gst/gstiterator.c
+++ b/gst/gstiterator.c
@@ -473,7 +473,7 @@ foreach_fold_func (gpointer item, GValue * unused, ForeachFoldData * data)
 
 /**
  * gst_iterator_foreach:
- * @it: The #GstIterator to iterate
+ * @iter: The #GstIterator to iterate
  * @func: the function to call for each element.
  * @user_data: user data passed to the function
  *
diff --git a/gst/gstiterator.h b/gst/gstiterator.h
index ad59b1a..9716a7b 100644
--- a/gst/gstiterator.h
+++ b/gst/gstiterator.h
@@ -90,7 +90,7 @@ GstIterator*		gst_iterator_new_list		(GMutex *lock,
 							 GstIteratorDisposeFunction free);
 
 /* using iterators */
-GstIteratorResult	gst_iterator_next		(GstIterator *it, gpointer *result);
+GstIteratorResult	gst_iterator_next		(GstIterator *it, gpointer *elem);
 void			gst_iterator_resync		(GstIterator *it);
 void			gst_iterator_free		(GstIterator *it);
 
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 5b7f847..c71e4ff 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -855,7 +855,7 @@ gst_pad_is_blocked (GstPad * pad)
 /**
  * gst_pad_set_activate_function:
  * @pad: a sink #GstPad.
- * @chain: the #GstPadActivateFunction to set.
+ * @activate: the #GstPadActivateFunction to set.
  *
  * Sets the given activate function for the pad. The activate function will
  * dispatch to activate_push or activate_pull to perform the actual activation.
@@ -876,7 +876,7 @@ gst_pad_set_activate_function (GstPad * pad, GstPadActivateFunction activate)
 /**
  * gst_pad_set_activatepull_function:
  * @pad: a sink #GstPad.
- * @chain: the #GstPadActivateModeFunction to set.
+ * @activatepull: the #GstPadActivateModeFunction to set.
  *
  * Sets the given activate_pull function for the pad. An activate_pull function
  * prepares the element and any upstream connections for pulling. See XXX
@@ -896,7 +896,7 @@ gst_pad_set_activatepull_function (GstPad * pad,
 /**
  * gst_pad_set_activatepush_function:
  * @pad: a sink #GstPad.
- * @chain: the #GstPadActivateModeFunction to set.
+ * @activatepush: the #GstPadActivateModeFunction to set.
  *
  * Sets the given activate_push function for the pad. An activate_push function
  * prepares the element for pushing. See XXX part-activation.txt for details.
@@ -3140,9 +3140,9 @@ not_connected:
 /**
  * gst_pad_get_range:
  * @pad: a src #GstPad.
- * @buffer: a pointer to hold the #GstBuffer.
  * @offset: The start offset of the buffer
- * @length: The length of the buffer
+ * @size: The length of the buffer
+ * @buffer: a pointer to hold the #GstBuffer.
  *
  * Calls the getrange function of @pad. 
  *
@@ -3223,9 +3223,9 @@ dropping:
 /**
  * gst_pad_pull_range:
  * @pad: a sink #GstPad.
- * @buffer: a pointer to hold the #GstBuffer.
  * @offset: The start offset of the buffer
- * @length: The length of the buffer
+ * @size: The length of the buffer
+ * @buffer: a pointer to hold the #GstBuffer.
  *
  * Pulls a buffer from the peer pad. @pad must be linked.
  *
diff --git a/gst/gstprobe.h b/gst/gstprobe.h
index 6afe506..2856f59 100644
--- a/gst/gstprobe.h
+++ b/gst/gstprobe.h
@@ -54,7 +54,7 @@ GstProbe*		gst_probe_new			(gboolean single_shot,
 							 gpointer user_data);
 void			gst_probe_destroy		(GstProbe *probe);
 
-gboolean		gst_probe_perform		(GstProbe *probe, GstMiniObject **data);
+gboolean		gst_probe_perform		(GstProbe *probe, GstMiniObject **mini_object);
 
 typedef struct _GstProbeDispatcher GstProbeDispatcher;
 
diff --git a/gst/gstutils.c b/gst/gstutils.c
index cd80601..f04ae15 100644
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -1234,7 +1234,7 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname,
  * @srcpadname: the name of the #GstPad in source element or NULL for any pad.
  * @dest: the #GstElement containing the destination pad.
  * @destpadname: the name of the #GstPad in destination element or NULL for any pad.
- * @caps: the #GstCaps to filter the link, or #NULL for no filter.
+ * @filter: the #GstCaps to filter the link, or #NULL for no filter.
  *
  * Links the two named pads of the source and destination elements. Side effect
  * is that if one of the pads has no parent, it becomes a child of the parent of
@@ -1673,7 +1673,7 @@ gst_pad_get_parent_element (GstPad * pad)
 
 /**
  * gst_flow_get_name:
- * @state: a #GstFlowReturn to get the name of.
+ * @ret: a #GstFlowReturn to get the name of.
  *
  * Gets a string representing the given flow return.
  *
@@ -1708,8 +1708,7 @@ gst_flow_get_name (GstFlowReturn ret)
 
 /**
  * gst_object_default_error:
- * @object: a #GObject that signalled the error.
- * @orig: the #GstObject that initiated the error.
+ * @source: the #GstObject that initiated the error.
  * @error: the GError.
  * @debug: an additional debug information string, or NULL.
  *
@@ -2208,25 +2207,25 @@ gst_pad_query_position (GstPad * pad, GstFormat * format, gint64 * cur,
  */
 gboolean
 gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
-    GstFormat * dest_fmt, gint64 * dest_val)
+    GstFormat * dest_format, gint64 * dest_val)
 {
   GstQuery *query;
   gboolean ret;
 
   g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
-  g_return_val_if_fail (dest_fmt != NULL, FALSE);
+  g_return_val_if_fail (dest_format != NULL, FALSE);
   g_return_val_if_fail (dest_val != NULL, FALSE);
 
-  if (*dest_fmt == src_format) {
+  if (*dest_format == src_format) {
     *dest_val = src_val;
     return TRUE;
   }
 
-  query = gst_query_new_convert (src_format, src_val, *dest_fmt);
+  query = gst_query_new_convert (src_format, src_val, *dest_format);
   ret = gst_pad_query (pad, query);
 
   if (ret)
-    gst_query_parse_convert (query, NULL, NULL, dest_fmt, dest_val);
+    gst_query_parse_convert (query, NULL, NULL, dest_format, dest_val);
 
   gst_query_unref (query);
 
diff --git a/gst/gstutils.h b/gst/gstutils.h
index 179c741..18cb595 100644
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -339,7 +339,7 @@ G_CONST_RETURN gchar*   gst_flow_get_name      		(GstFlowReturn ret);
 gboolean                gst_pad_query_position          (GstPad *pad, GstFormat *format,
 		                                         gint64 *cur, gint64 *end);
 gboolean                gst_pad_query_convert           (GstPad *pad, GstFormat src_format, gint64 src_val,
-		                                         GstFormat *dest_fmt, gint64 *dest_val);
+		                                         GstFormat *dest_format, gint64 *dest_val);
 
 /* bin functions */
 void            	gst_bin_add_many                (GstBin *bin, GstElement *element_1, ...);
-- 
2.7.4