RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cache: change license to LGPL v3 

All authors have agreed to the relicensing.

iive has insisted on "LGPL v3 or later", which makes the file LGPL v3.
His commits are the following: 84ec577508 9b0d8c680f. All other
contributions are LGPL v2.1. I hope we can remove these changes
completely one day to make this file LGPL v2.1.

iive also authored commit 3934b160a8, but this code is completely gone
today. (fork() and shared memory use was removed completely in favor of
threads.)
This commit is contained in:
wm4 2017-05-08 12:55:18 +02:00
parent d89b4458cc
commit 7eccb62f85
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Copyright
View File

@ -219,7 +219,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 medium
stream/cache.c LGPL 3+
stream/cache_file.c LGPL
stream/cookies.* unknown
stream/dvb* must stay GPL

19
stream/cache.c
View File

@ -1,18 +1,23 @@
/*
* 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 3 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/>.
*
* 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.)
*/
// Time in seconds the main thread waits for the cache thread. On wakeups, the