summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Copyright2
-rw-r--r--stream/cache.c19
2 files changed, 13 insertions, 8 deletions
diff --git a/Copyright b/Copyright
index e4e6846ad5..b03b4b9018 100644
--- a/Copyright
+++ b/Copyright
@@ -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
diff --git a/stream/cache.c b/stream/cache.c
index b2ff1a91c8..355025f351 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -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