diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-16 16:53:04 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-16 16:53:04 +0200 |
| commit | b935a814d949f71b1d5968d3f87ce365381fdb95 (patch) | |
| tree | 09e08df568b875051908b43b36ac5bc698974bce /docs/plugins | |
| parent | 6bff1f968a61a32141f27cfda20e25c0af24cfd7 (diff) | |
| parent | fe1dcbe6fa1625ae83980f4da813f0f3764e7d51 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
docs/gst/gstreamer-sections.txt
gst/gstbin.c
gst/gstelement.c
gst/gstelement.h
gst/gstghostpad.c
gst/gstminiobject.c
gst/gstminiobject.h
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasetransform.c
plugins/elements/gstinputselector.c
tests/check/gst/gstminiobject.c
Diffstat (limited to 'docs/plugins')
| -rw-r--r-- | docs/plugins/gstreamer-plugins.args | 20 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-coreelements.xml | 4 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-coreindexers.xml | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args index c7f3571f1..5d965e6ae 100644 --- a/docs/plugins/gstreamer-plugins.args +++ b/docs/plugins/gstreamer-plugins.args @@ -849,6 +849,16 @@ </ARG> <ARG> +<NAME>GstMultiQueue::sync-by-running-time</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Sync By Running Time</NICK> +<BLURB>Synchronize deactivated or not-linked streams by running time.</BLURB> +<DEFAULT>FALSE</DEFAULT> +</ARG> + +<ARG> <NAME>GstBin::async-handling</NAME> <TYPE>gboolean</TYPE> <RANGE></RANGE> @@ -1068,3 +1078,13 @@ <DEFAULT>FALSE</DEFAULT> </ARG> +<ARG> +<NAME>GstInputSelector::sync-streams</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Sync Streams</NICK> +<BLURB>Synchronize inactive streams to the running time of the active stream.</BLURB> +<DEFAULT>FALSE</DEFAULT> +</ARG> + diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index b7ca01a07..aef69a714 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,10 +3,10 @@ <description>standard GStreamer elements</description> <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename> <basename>libgstcoreelements.so</basename> - <version>0.10.32.4</version> + <version>0.10.34.1</version> <license>LGPL</license> <source>gstreamer</source> - <package>GStreamer prerelease</package> + <package>GStreamer git</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml index 2ff211877..e8d2401b2 100644 --- a/docs/plugins/inspect/plugin-coreindexers.xml +++ b/docs/plugins/inspect/plugin-coreindexers.xml @@ -3,10 +3,10 @@ <description>GStreamer core indexers</description> <filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename> <basename>libgstcoreindexers.so</basename> - <version>0.10.32.4</version> + <version>0.10.34.1</version> <license>LGPL</license> <source>gstreamer</source> - <package>GStreamer prerelease</package> + <package>GStreamer git</package> <origin>Unknown package origin</origin> <elements> </elements> |