Commit 007a00cd authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
parents ab7d8886 bb78f15e
......@@ -99,7 +99,7 @@ What are the exact licensing terms for GStreamer and its plugins ?
<answer>
<para>
All of GStreamer, including our own plugin code, is licensed under the
<ulink url="http://www.gnu.org/licenses/lgpl.html">GNU LGPL</ulink> license.
<ulink url="http://www.gnu.org/licenses/lgpl-2.1.html">GNU LGPL 2.1</ulink> license.
Some of the libraries we use for some of the plugins are however under the
GPL, which means that those plugins can not be used by a non-GPL-compatible
application.
......
......@@ -449,9 +449,9 @@ gst_collect_pads2_set_event_function (GstCollectPads2 * pads,
}
/**
* gst_collect_pads2_clip_running:
* gst_collect_pads2_clip_running_time:
* @pads: the collectspads to use
* @cdata: collect data of corrsponding pad
* @cdata: collect data of corresponding pad
* @buf: buffer being clipped
* @outbuf: output buffer with running time, or NULL if clipped
* @user_data: user data (unused)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment