summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-05-20 11:35:25 +0200
committerwm4 <wm4@nowhere>2017-05-20 11:43:57 +0200
commit7840125e223b9c95b8532223a8ecd39c33d04849 (patch)
treec6b651b37be848f03bbc227f5f611fefc959d14b /Copyright
parent9b5e4e5715deede7bdea8e7a17f1bb85e4b7b09b (diff)
downloadmpv-7840125e223b9c95b8532223a8ecd39c33d04849.tar.bz2
mpv-7840125e223b9c95b8532223a8ecd39c33d04849.tar.xz
audio/out: change license of some core files to LGPL
All contributors of the current code have agreed. ao.c requires a "driver" entry for each audio output - we assume that if someone who didn't agree to LGPL added a line, it's fine for ao.c to be LGPL anyway. If the affected audio output is not disabled at compilation time, the resulting binary will be GPL anyway, and ootherwise the code is not included. The audio output code itself was inspired or partially copied from libao in 7a2eec4b59f4 (thus why MPlayer's audio code is named libao2). Just to be sure we got permission from Aaron Holtzman, Jack Moffitt, and Stan Seibert, who according to libao's SVN history and README are the initial author. (Something similar was done for libvo, although the commit relicensing it forgot to mention it.) 242aa6ebd40: anders mostly disagreed with the LGPL relicensing, but we got permission for this particular commit. 0ef8e555735: nick could not be reached, but the include statement was removed again anyway. 879e05a7c17: iive agreed to LGPL v3+ only, but this line of code was removed anyway, so ao_null.c can be LGPL v2.1+. 9dd8f241ac2: patch author could not be reached, but the corresponding code (old slave mode interface) was completely removed later.
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright14
1 files changed, 7 insertions, 7 deletions
diff --git a/Copyright b/Copyright
index a1321efbdf..c00c88b011 100644
--- a/Copyright
+++ b/Copyright
@@ -73,8 +73,8 @@ LGPL relicensing status:
audio/filter/af_lavfi.c LGPL
audio/filter/af_scaletempo.c LGPL
audio/filter/af_rubberband.c LGPL
- audio/out/ao.c hard
- audio/out/ao.h very hard (anders' changes)
+ audio/out/ao.c LGPL
+ audio/out/ao.h LGPL
audio/out/ao_alsa.c extremely hard (original author did not decide)
audio/out/ao_audiounit.m LGPL
audio/out/ao_coreaudio.c LGPL
@@ -85,9 +85,9 @@ LGPL relicensing status:
audio/out/ao_coreaudio_properti LGPL
audio/out/ao_coreaudio_utils.c LGPL
audio/out/ao_coreaudio_utils.h LGPL
- audio/out/ao_jack.c unknown
+ audio/out/ao_jack.c will stay GPL
audio/out/ao_lavc.c probably easy
- audio/out/ao_null.c unknown
+ audio/out/ao_null.c LGPL
audio/out/ao_openal.c unknown
audio/out/ao_opensles.c LGPL
audio/out/ao_oss.c will stay GPL
@@ -100,9 +100,9 @@ LGPL relicensing status:
audio/out/ao_wasapi_changenotif LGPL
audio/out/ao_wasapi.h LGPL
audio/out/ao_wasapi_utils.c LGPL
- audio/out/internal.h very hard (anders' changes)
- audio/out/pull.c unknown
- audio/out/push.c unknown
+ audio/out/internal.h LGPL
+ audio/out/pull.c LGPL
+ audio/out/push.c LGPL
audio/audio.* very hard (mp_audio based of anders' af_audio)
audio/audio_buffer.* LGPL
audio/chmap.* LGPL