RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 12:17:12 +00:00
Code Issues Releases Wiki Activity

cache: clarify that copyright will be changed to LGPL v2.1 if possible

Browse Source 
Clearly the licensing situation isn't confusing enough.

I don't know why that guy insists on LGPLv3.
This commit is contained in:
wm4 2017-05-11 17:02:43 +02:00
parent c0ba8b520f
commit f2961425e7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Copyright
View File

@ -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 of mpv changes to LGPL. We interpret "core" as something minimal, that can
actually be built and run, with all GPL code disabled. 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: LGPL relicensing status:
audio/decode/ad.h LGPL audio/decode/ad.h LGPL
@ -222,7 +228,7 @@ LGPL relicensing status:
player/video.c extremely hard player/video.c extremely hard
stream/ai_* will stay GPL (TV code) stream/ai_* will stay GPL (TV code)
stream/audio_in.* 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/cache_file.c LGPL
stream/cookies.* LGPL stream/cookies.* LGPL
stream/dvb* must stay GPL stream/dvb* must stay GPL

2
stream/cache.c
View File

@ -18,6 +18,8 @@
* 84ec57750883 remove unused cache-prefill and create cache-seek-min that... * 84ec57750883 remove unused cache-prefill and create cache-seek-min that...
* 9b0d8c680f63 cache min fill adjustment, based on patch by Jeremy Huddleston * 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.) * (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 // Time in seconds the main thread waits for the cache thread. On wakeups, the