summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-05-11 07:29:01 +0200
committerwm4 <wm4@nowhere>2017-05-11 07:29:01 +0200
commita28cf44ebc90f9fb4c1943aa128dd5d25573e181 (patch)
treea14dde10db671d9c87462496395bec010234ee5d
parent0e09533c73dc06b34b4fc8b2f53e43983bef059d (diff)
downloadmpv-a28cf44ebc90f9fb4c1943aa128dd5d25573e181.tar.bz2
mpv-a28cf44ebc90f9fb4c1943aa128dd5d25573e181.tar.xz
cookies: change license to LGPL
All authors have agreed. One minor exception is 21a9221e7bb2 (patch by someone who wasn't asked), but we just remove the added line again. It seems unneeded.
-rw-r--r--Copyright2
-rw-r--r--stream/cookies.c15
-rw-r--r--stream/cookies.h14
3 files changed, 15 insertions, 16 deletions
diff --git a/Copyright b/Copyright
index 8306b423fe..466205db1e 100644
--- a/Copyright
+++ b/Copyright
@@ -221,7 +221,7 @@ LGPL relicensing status:
stream/audio_in.* will stay GPL (TV code)
stream/cache.c LGPL 3+
stream/cache_file.c LGPL
- stream/cookies.* unknown
+ stream/cookies.* LGPL
stream/dvb* must stay GPL
stream/frequencies.* must stay GPL
stream/rar.* LGPL
diff --git a/stream/cookies.c b/stream/cookies.c
index ce2d4ed503..d1c6e6d488 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -6,18 +6,18 @@
*
* 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 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
* 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/>.
*/
#include <stdio.h>
@@ -28,7 +28,6 @@
#include <sys/types.h>
#include <dirent.h>
#include <inttypes.h>
-#include <limits.h>
#include "osdep/io.h"
diff --git a/stream/cookies.h b/stream/cookies.h
index 7c4d6414b4..6acd0c3ba3 100644
--- a/stream/cookies.h
+++ b/stream/cookies.h
@@ -6,18 +6,18 @@
*
* 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 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
* 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/>.
*/
#ifndef MPLAYER_COOKIES_H