mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	configure.ac
This commit is contained in:
Wim Taymans 2012-03-22 10:45:06 +01:00
commit 007a00cd1b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/faq/general.xml
View file

@ -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.

4
libs/gst/base/gstcollectpads2.c
View file

@ -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)