summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-05-08 14:09:49 +0200
committerwm4 <wm4@nowhere>2017-05-08 14:09:49 +0200
commit04df16bfd3cbc4c31921f468b7484f27d033f7a5 (patch)
treea16d1489354ee4a66a85ea25af1a1cd3bd48b5c0
parentc87224bf1b95135cd83bf7bd93cac8f540be23b7 (diff)
downloadmpv-04df16bfd3cbc4c31921f468b7484f27d033f7a5.tar.bz2
mpv-04df16bfd3cbc4c31921f468b7484f27d033f7a5.tar.xz
ao_pulse, ao_rsound: change license to LGPL
All authors have agreed. One exception is 71247a97b35, whose author was not asked, but we deem the change as trivial. (And technically it was replaced when the audio chain dropped non-native endian sample formats.)
-rw-r--r--Copyright4
-rw-r--r--audio/out/ao_pulse.c14
-rw-r--r--audio/out/ao_rsound.c14
3 files changed, 16 insertions, 16 deletions
diff --git a/Copyright b/Copyright
index 17b0ae22aa..e620287a2e 100644
--- a/Copyright
+++ b/Copyright
@@ -83,8 +83,8 @@ LGPL relicensing status:
audio/out/ao_opensles.c LGPL
audio/out/ao_oss.c will stay GPL
audio/out/ao_pcm.c unknown
- audio/out/ao_pulse.c easy
- audio/out/ao_rsound.c easy
+ audio/out/ao_pulse.c LGPL
+ audio/out/ao_rsound.c LGPL
audio/out/ao_sdl.c LGPL
audio/out/ao_sndio.c LGPL (BSD)
audio/out/ao_wasapi.c LGPL
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index eb53b4604a..ae9b3c5a8d 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -5,18 +5,18 @@
*
* This file is part of mpv.
*
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 4140716bc0..bd3cc2f249 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -5,18 +5,18 @@
*
* This file is part of mpv.
*
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"