diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-11 10:26:54 +0200 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-04-11 10:26:54 +0200 |
commit | 6be4dbdb5a1856d79369574afd8d5df460fb1af2 (patch) | |
tree | daa5fb81f37e0561ef6a5638029c09811c8d6a42 /docs/plugins | |
parent | df85690cfdac9fe15cccaf85b20373e0a81be714 (diff) | |
parent | 3f1ef2255a2e7c316d7c877d3a3f6bb815bc79a4 (diff) |
Merge branch 'master' into 0.11
Conflicts:
android/base.mk
android/controller.mk
android/dataprotocol.mk
android/elements.mk
android/gst-inspect.mk
android/gst-launch.mk
android/gst-plugin-scanner.mk
android/gst.mk
android/indexers.mk
android/net.mk
win32/common/libgstbase.def
Diffstat (limited to 'docs/plugins')
-rw-r--r-- | docs/plugins/gstreamer-plugins.args | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args index 9fa076ba2..507789f70 100644 --- a/docs/plugins/gstreamer-plugins.args +++ b/docs/plugins/gstreamer-plugins.args @@ -991,7 +991,7 @@ <ARG> <NAME>GstQueue2::ring-buffer-max-size</NAME> <TYPE>guint64</TYPE> -<RANGE><= G_MAXUINT</RANGE> +<RANGE></RANGE> <FLAGS>rw</FLAGS> <NICK>Max. ring buffer size (bytes)</NICK> <BLURB>Max. amount of data in the ring buffer (bytes, 0 = disabled.</BLURB> |