summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2004-09-20 14:25:08 +0000
committerChristian Schaller <uraeus@gnome.org>2004-09-20 14:25:08 +0000
commit8b540472150b26b672e72a66cbaacb43a5351741 (patch)
tree70401bfa5284f494c0bfc4b2174624ed0294e820
parentd102f96ec540c8919ae051402825ce7be56c9ba2 (diff)
fix license information
Original commit message from CVS: fix license information
-rw-r--r--ChangeLog5
-rw-r--r--LICENSE_readme17
-rw-r--r--ext/mikmod/gstmikmod.c2
3 files changed, 10 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index a9cd5063..96477581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-20 Christian Schaller <christian@fluendo.com>
+
+ * Fix mixmod license to LGPL as they have relicensed
+ * Move Dirac and Effectv into LGPL section of README_license
+
2004-09-20 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/mad/gstmad.c: (gst_mad_check_caps_reset),
diff --git a/LICENSE_readme b/LICENSE_readme
index a965f334..4a79dfa5 100644
--- a/LICENSE_readme
+++ b/LICENSE_readme
@@ -72,6 +72,7 @@ ladspa (http://www.ladspa.org/)
lame libmp3lame (http://lame.sourceforge.net/)
libvisual libvisual (http://libvisual.sourceforge.net/)
matroska (http://www.matroska.org/)
+mikmod libmikmod (http://mikmod.raphnet.net/)
ossaudio (http://www.opensound.com/)
qcamsrc
rfbenc librfb
@@ -81,6 +82,9 @@ smoothwave
swfdec (http://swfdec.sourceforge.net/)
tarkin (http://svn.xiph.org/trunk/tarkin/)
textoverlay pango (http://www.pango.org/)
+dirac (http://www.bbc.co.uk/rd/projects/dirac/)
+effectv (Our ports was relicensed)(http://effectv.sourceforge.net/)
+
Plugins which use a BSD covered library are as follows:
@@ -118,10 +122,6 @@ sunaudiosink (http://www.sun.com/)
Unsure:
-mikmod libmikmod (http://mikmod.raphnet.net/)
-Seems a newer release of mikmod is LGPL, though it's listed as GPL by
-GStreamer.
-
faad libfaad (http://www.audiocoding.com/)
faad's license depends on its major version :
- for FAAD1 : it is LGPL
@@ -132,12 +132,3 @@ http://www.audiocoding.com/modules/wiki/?page=FAAC
by default, GStreamer faad plugin would compile against FAAD2 if available.
it falls back to FAAD1 if not.
-
-dirac (http://www.bbc.co.uk/rd/projects/dirac/)
-The sourceforge website claims it uses GPL, LGPL, and the Mozilla Public
-License 1.1. Not sure which parts GStreamer uses, and what licenses are
-inherited.
-
-effectv effectv (http://effectv.sourceforge.net/)
-The sourceforge website claims it uses GPL, though it is currently
-listed as an LGPL library in GStreamer.
diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c
index e7f90748..72dbbe8d 100644
--- a/ext/mikmod/gstmikmod.c
+++ b/ext/mikmod/gstmikmod.c
@@ -552,4 +552,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"mikmod",
"Mikmod plugin library",
- plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+ plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)