diff --git a/docs/faq/general.xml b/docs/faq/general.xml index c6ccb6ac70..e85bec0c9d 100644 --- a/docs/faq/general.xml +++ b/docs/faq/general.xml @@ -99,7 +99,7 @@ What are the exact licensing terms for GStreamer and its plugins ? All of GStreamer, including our own plugin code, is licensed under the -GNU LGPL license. +GNU LGPL 2.1 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. diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c index f70d366f50..600fd4f2a1 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads2.c @@ -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)