diff options
| author | wm4 <wm4@nowhere> | 2017-10-05 15:54:10 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-05 15:57:30 +0200 |
| commit | 158b69f04cac6685eadd1a96c36f5d1f644c5b0b (patch) | |
| tree | 9b80b39cc79aff33f51a018d869ca2862a027dd6 /stream | |
| parent | 4eb8623945909e712eea7002b26773b4b8ab9e87 (diff) | |
| download | mpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.bz2 mpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.xz | |
build: switch preliminary LGPL mode from v3 to v2.1
iive agreed to relicense things that are still in mpv to LGPLv2.1. So
change the licenses of the affected files, and rename the configure
switch for LGPL mode to --enable-preliminary-lgpl2.
(The "preliminary" part will probably be removed from the configure
switch soon as well.)
Also player/main.c hasn't had GPL parts since a few commits ago.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/cache.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/stream/cache.c b/stream/cache.c index a458dd14a7..ab94c8734e 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -4,7 +4,7 @@ * 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 3 of the License, or (at your option) any later version. + * 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 @@ -13,13 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - * - * The parts making this file LGPL v3 (instead of v2.1 or later) are: - * 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 |