mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

add MPL and Properietart to list of licenses

Browse source 
Original commit message from CVS:
add MPL and Properietart to list of licenses
This commit is contained in:
Christian Schaller 2006-01-18 11:44:55 +00:00
parent bbcfe40af4
commit e7021f7395
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2006-01-18 Christian Schaller <Christian@fluendo.com>
* gst/gstplugin.c: Add MPL and Proprietary as license options
2006-01-18 Andy Wingo <wingo@pobox.com> 2006-01-18 Andy Wingo <wingo@pobox.com>
* gst/gstindex.h (gst_index_add_associationv): Add to header. The * gst/gstindex.h (gst_index_add_associationv): Add to header. The

3
gst/gstplugin.c
View file

@ -93,12 +93,15 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
* GPL: http://www.gnu.org/copyleft/gpl.html * GPL: http://www.gnu.org/copyleft/gpl.html
* LGPL: http://www.gnu.org/copyleft/lesser.html * LGPL: http://www.gnu.org/copyleft/lesser.html
* QPL: http://www.trolltech.com/licenses/qpl.html * QPL: http://www.trolltech.com/licenses/qpl.html
* MPL: http://www.opensource.org/licenses/mozilla1.1.php
*/ */
static gchar *valid_licenses[] = { static gchar *valid_licenses[] = {
"LGPL", /* GNU Lesser General Public License */ "LGPL", /* GNU Lesser General Public License */
"GPL", /* GNU General Public License */ "GPL", /* GNU General Public License */
"QPL", /* Trolltech Qt Public License */ "QPL", /* Trolltech Qt Public License */
"GPL/QPL", /* Combi-license of GPL + QPL */ "GPL/QPL", /* Combi-license of GPL + QPL */
"MPL", /* MPL 1.1 license */
"Proprietary", /* Proprietary license */
GST_LICENSE_UNKNOWN, /* some other license */ GST_LICENSE_UNKNOWN, /* some other license */
NULL NULL
}; };