[xiph-commits] r18307 - icecast/branches/icecast-webm/src

[giles at svn.xiph.org]

Author: giles
Date: 2012-05-24 11:32:06 -0700 (Thu, 24 May 2012)
New Revision: 18307

Modified:
   icecast/branches/icecast-webm/src/format_ebml.c
   icecast/branches/icecast-webm/src/format_ebml.h
   icecast/branches/icecast-webm/src/format_opus.c
   icecast/branches/icecast-webm/src/format_opus.h
Log:
Clarify that only these specific files are GPLv2 or v3.

Icecast itself remains GPLv2 only.


Modified: icecast/branches/icecast-webm/src/format_ebml.c
===================================================================
--- icecast/branches/icecast-webm/src/format_ebml.c	2012-05-24 18:12:46 UTC (rev 18306)
+++ icecast/branches/icecast-webm/src/format_ebml.c	2012-05-24 18:32:06 UTC (rev 18307)
@@ -1,7 +1,9 @@
 /* Icecast
  *
  * This program is distributed under the GNU General Public License,
- * version 2, or later. A copy of this license is included with this source.
+ * version 2. A copy of this license is included with this source.
+ * At your option, this specific source file can also be distributed
+ * under the GNU GPL version 3.
  *
  * Copyright 2012,      David Richards, Mozilla Foundation,
  *                      and others (see AUTHORS for details).

Modified: icecast/branches/icecast-webm/src/format_ebml.h
===================================================================
--- icecast/branches/icecast-webm/src/format_ebml.h	2012-05-24 18:12:46 UTC (rev 18306)
+++ icecast/branches/icecast-webm/src/format_ebml.h	2012-05-24 18:32:06 UTC (rev 18307)
@@ -1,7 +1,9 @@
 /* Icecast
  *
  * This program is distributed under the GNU General Public License,
- * version 2 or later. A copy of this license is included with this source.
+ * version 2. A copy of this license is included with this source.
+ * At your option, this specific source file can also be distributed
+ * under the GNU GPL version 3.
  *
  * Copyright 2012,      David Richards, Mozilla Foundation,
  *                      and others (see AUTHORS for details).

Modified: icecast/branches/icecast-webm/src/format_opus.c
===================================================================
--- icecast/branches/icecast-webm/src/format_opus.c	2012-05-24 18:12:46 UTC (rev 18306)
+++ icecast/branches/icecast-webm/src/format_opus.c	2012-05-24 18:32:06 UTC (rev 18307)
@@ -1,7 +1,9 @@
 /* Icecast
  *
  *  This program is distributed under the GNU General Public License,
- *  version 2 or later. A copy of this license is included with this source.
+ *  version 2. A copy of this license is included with this source.
+ *  At your option, this specific source file can also be distributed
+ *  under the GNU GPL version 3.
  *
  * Copyright 2012,      David Richards, Mozilla Foundation,
  *                      and others (see AUTHORS for details).

Modified: icecast/branches/icecast-webm/src/format_opus.h
===================================================================
--- icecast/branches/icecast-webm/src/format_opus.h	2012-05-24 18:12:46 UTC (rev 18306)
+++ icecast/branches/icecast-webm/src/format_opus.h	2012-05-24 18:32:06 UTC (rev 18307)
@@ -1,7 +1,9 @@
 /* Icecast
  *
  * This program is distributed under the GNU General Public License,
- * version 2 or later. A copy of this license is included with this source.
+ * version 2. A copy of this license is included with this source.
+ * At your option, this specific source file can also be distributed
+ * under the GNU GPL version 3.
  *
  * Copyright 2012,      David Richards, Mozilla Foundation,
  *                      and others (see AUTHORS for details).