diff options
| author | wm4 <wm4@nowhere> | 2017-05-11 17:02:43 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-05-11 17:11:01 +0200 |
| commit | f2961425e770defe7cedc14ee2d4c9d4a53ab203 (patch) | |
| tree | cd6264370fa9ac2377b9f503e5e38217a71f6306 | |
| parent | c0ba8b520f4258539f860e13d1b781f15df701cb (diff) | |
| download | mpv-f2961425e770defe7cedc14ee2d4c9d4a53ab203.tar.bz2 mpv-f2961425e770defe7cedc14ee2d4c9d4a53ab203.tar.xz | |
cache: clarify that copyright will be changed to LGPL v2.1 if possible
Clearly the licensing situation isn't confusing enough.
I don't know why that guy insists on LGPLv3.
| -rw-r--r-- | Copyright | 8 | ||||
| -rw-r--r-- | stream/cache.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -49,6 +49,12 @@ interpreted as that his code can be changed to LGPL only as soon as the "core" of mpv changes to LGPL. We interpret "core" as something minimal, that can actually be built and run, with all GPL code disabled. +Some files are LGPLv3+. This is due to the contributions of a single developer +going by the SVN username "iive". The chosen license of this project is +LGPLv2.1+. The affected files will be changed to LGPLv2.1+ at the earliest +opportunity, for example if his contributions disappear by being replaced +or removed. All new contributions to these files are implied to be LGPLv2.1+. + LGPL relicensing status: audio/decode/ad.h LGPL @@ -222,7 +228,7 @@ LGPL relicensing status: player/video.c extremely hard stream/ai_* will stay GPL (TV code) stream/audio_in.* will stay GPL (TV code) - stream/cache.c LGPL 3+ + stream/cache.c LGPLv3+ stream/cache_file.c LGPL stream/cookies.* LGPL stream/dvb* must stay GPL diff --git a/stream/cache.c b/stream/cache.c index 355025f351..52bf86ba01 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -18,6 +18,8 @@ * 84ec57750883 remove unused cache-prefill and create cache-seek-min that... * 9b0d8c680f63 cache min fill adjustment, based on patch by Jeremy Huddleston * (iive agreed to LGPL v3+ only. Jeremy agreed to LGPL v2.1 or later.) + * Once these changes are not relevant to for copyright anymore (e.g. because + * they have been removed), this file will change to LGPLv2.1+. */ // Time in seconds the main thread waits for the cache thread. On wakeups, the |