diff --git a/common b/common
index bca2dfba7b..655da47ef8 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bca2dfba7bfc36020b5ba26b640ebde4cc76a5f0
+Subproject commit 655da47ef800ef59a367fb0768d27adc5ca9e489
diff --git a/configure.ac b/configure.ac
index b1b09de250..0eb4c100e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,6 +504,7 @@ docs/manual/Makefile
docs/fwg/Makefile
docs/xsl/Makefile
docs/devhelp/Makefile
+docs/devhelp/html2xml.py
stamp.h
gstreamer.pc
gstreamer-uninstalled.pc
diff --git a/docs/devhelp/html2xml.py b/docs/devhelp/html2xml.py.in
similarity index 99%
rename from docs/devhelp/html2xml.py
rename to docs/devhelp/html2xml.py.in
index acb89d4085..3f0e9eba66 100644
--- a/docs/devhelp/html2xml.py
+++ b/docs/devhelp/html2xml.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!@PYTHON@
import formatter
import htmllib
import os
diff --git a/docs/gst/tmpl/gstbin.sgml b/docs/gst/tmpl/gstbin.sgml
index 3f17b4b0aa..d1b4498665 100644
--- a/docs/gst/tmpl/gstbin.sgml
+++ b/docs/gst/tmpl/gstbin.sgml
@@ -151,17 +151,6 @@ Free the memory allocated by this bin
@Returns:
-
-
-
-
-
-@bin:
-@state:
-@type:
-@Returns:
-
-
diff --git a/docs/gst/tmpl/gstbuffer.sgml b/docs/gst/tmpl/gstbuffer.sgml
index dec7111c35..1d32fb1d57 100644
--- a/docs/gst/tmpl/gstbuffer.sgml
+++ b/docs/gst/tmpl/gstbuffer.sgml
@@ -345,8 +345,10 @@ created buffer can be safely written to.
If the refcount is 1, this function just returns the original buffer.
-@buffer: a #GstBuffer to copy.
+@buf:
@Returns: the #GstBuffer that can safely be written to.
+
+@buffer: a #GstBuffer to copy.
@@ -355,6 +357,8 @@ Frees the given buffer, regardless of the refcount.
It is dangerous to use this function, you should use gst_buffer_unref() instead.
+@buf:
+
@buffer: a #GstBuffer to free.
diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml
index ab033e9fd9..82b040fc30 100644
--- a/docs/gst/tmpl/gstobject.sgml
+++ b/docs/gst/tmpl/gstobject.sgml
@@ -297,6 +297,14 @@ this signal to insert custom XML tags into the core XML.
@gstobject: the object which received the signal.
@arg1: the new parent
+
+
+
+
+
+@gstobject: the object which received the signal.
+@arg1:
+
The name of the object
diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml
index ddcb57d01f..75e3092d42 100644
--- a/docs/gst/tmpl/gstpad.sgml
+++ b/docs/gst/tmpl/gstpad.sgml
@@ -258,12 +258,15 @@ The signature of the internal pad connection function
The different supported query types
+@GST_PAD_QUERY_NONE:
@GST_PAD_QUERY_TOTAL: Query the total stream time
@GST_PAD_QUERY_POSITION: Query the current stream position
@GST_PAD_QUERY_LATENCY: Query the latency on the pad
@GST_PAD_QUERY_JITTER: Query the average jitter beteen optimal processing and current
processing.
+@GST_PAD_QUERY_START:
@GST_PAD_QUERY_SEGMENT_END: Query the end position of the currently executing segment
+@GST_PAD_QUERY_RATE:
@@ -912,9 +915,11 @@ Destroy the pad.
@caps:
@filter:
@appfilter:
+@getcapsfunc:
@direction:
@sched:
@sched_private:
+@connectfunc:
@peer:
@bufpen:
@chainfunc:
@@ -923,13 +928,14 @@ Destroy the pad.
@gethandler:
@eventfunc:
@eventhandler:
+@eventmaskfunc:
+@ghostpads:
@convertfunc:
@queryfunc:
+@formatsfunc:
+@querytypefunc:
@intconnfunc:
-@getcapsfunc:
-@connectfunc:
@bufferpoolfunc:
-@ghostpads:
diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml
index 048557193a..61fa2a4f3e 100644
--- a/docs/gst/tmpl/gstreamer-unused.sgml
+++ b/docs/gst/tmpl/gstreamer-unused.sgml
@@ -467,8 +467,7 @@ GstIdentity
-MD5 Sink can be used to automate regression tests on media pipelines by
-computing a hash on the resulting buffers.
+
@@ -479,7 +478,7 @@ computing a hash on the resulting buffers.
-Compute a hash on buffer data.
+
@@ -5294,6 +5293,16 @@ must be defined to activate the tracing functionality.
@element:
@manager:
+
+
+
+
+
+@bin:
+@state:
+@type:
+@Returns:
+
diff --git a/docs/gst/tmpl/gstregistry.sgml b/docs/gst/tmpl/gstregistry.sgml
index a521013a2b..0fe0a1b184 100644
--- a/docs/gst/tmpl/gstregistry.sgml
+++ b/docs/gst/tmpl/gstregistry.sgml
@@ -32,6 +32,7 @@ The registry holds the available plugins in the system.
@GST_REGISTRY_READABLE:
@GST_REGISTRY_WRITABLE:
+@GST_REGISTRY_EXISTS:
@GST_REGISTRY_REMOTE:
@GST_REGISTRY_DELAYED_LOADING:
diff --git a/docs/xsl/fo.xsl b/docs/xsl/fo.xsl
index c96fddf3f6..ea984095ae 100644
--- a/docs/xsl/fo.xsl
+++ b/docs/xsl/fo.xsl
@@ -7,10 +7,13 @@
+ href="http://docbook.sourceforge.net/release/xsl/1.50.0/fo/docbook.xsl"/>
+
+
+
diff --git a/docs/xsl/html.xsl b/docs/xsl/html.xsl
index 47d9e745c2..f8498a72d2 100644
--- a/docs/xsl/html.xsl
+++ b/docs/xsl/html.xsl
@@ -15,4 +15,6 @@
+
+
diff --git a/gst/gstparse.c b/gst/gstparse.c
index 4d77567a73..1c43579f5b 100644
--- a/gst/gstparse.c
+++ b/gst/gstparse.c
@@ -458,6 +458,8 @@ gst_parse_launchv (const gchar **argv, GError **error)
const gchar **argvp, *arg;
gchar *tmp;
+ g_return_val_if_fail (argv != NULL, NULL);
+
/* let's give it a nice size. */
str = g_string_sized_new (1024);
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 19a0e5327b..9be75bc4b5 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -537,7 +537,7 @@ gst_registry_pool_plugin_list (void)
walk = g_list_next (walk);
}
- return result;
+ return g_list_concat (_gst_registry_pool_plugins, result);
}
/**