diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-05 12:27:51 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-05 12:27:51 +0200 |
| commit | 65eafd93402d5620a809cb63f0612fc2456de19d (patch) | |
| tree | d4e6c257791d194dc130abc2db66bd3e9660cb2d /libs/gst/base | |
| parent | 9ef1346b1fa0bd2bb42cd991a52ff308a728bdb6 (diff) | |
| parent | d72f559d297a06bec892fa5a6bd4e43094f8dcf5 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
docs/gst/gstreamer-sections.txt
gst/gstelementfactory.c
gst/gstminiobject.c
Diffstat (limited to 'libs/gst/base')
| -rw-r--r-- | libs/gst/base/gstbaseparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index d0fe4641e..0c5232eaa 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -2990,7 +2990,7 @@ gst_base_parse_set_syncable (GstBaseParse * parse, gboolean syncable) /** * gst_base_parse_set_passthrough: * @parse: a #GstBaseParse - * @passthrough: + * @passthrough: %TRUE if parser should run in passthrough mode * * Set if the nature of the format or configuration does not allow (much) * parsing, and the parser should operate in passthrough mode (which only |