diff --git a/ChangeLog b/ChangeLog index 5ebdac4660..7c208cfd63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-18 Christian Schaller + + * gst/gstplugin.c: Add MPL and Proprietary as license options + 2006-01-18 Andy Wingo * gst/gstindex.h (gst_index_add_associationv): Add to header. The diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 22549d4468..d3d89d731c 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -93,12 +93,15 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE; * GPL: http://www.gnu.org/copyleft/gpl.html * LGPL: http://www.gnu.org/copyleft/lesser.html * QPL: http://www.trolltech.com/licenses/qpl.html + * MPL: http://www.opensource.org/licenses/mozilla1.1.php */ static gchar *valid_licenses[] = { "LGPL", /* GNU Lesser General Public License */ "GPL", /* GNU General Public License */ "QPL", /* Trolltech Qt Public License */ "GPL/QPL", /* Combi-license of GPL + QPL */ + "MPL", /* MPL 1.1 license */ + "Proprietary", /* Proprietary license */ GST_LICENSE_UNKNOWN, /* some other license */ NULL };