summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-07 11:27:18 +0100
committerwm4 <wm4@nowhere>2016-01-07 11:27:18 +0100
commit0d05038790b3cd1725263a199bd4adb2334e837e (patch)
treec779a6231282dd1d3e2d564484c379bb1c660f30 /video
parent38636345b1d1e417922d86d456ff66cf6b2cb819 (diff)
downloadmpv-0d05038790b3cd1725263a199bd4adb2334e837e.tar.bz2
mpv-0d05038790b3cd1725263a199bd4adb2334e837e.tar.xz
filter_kernels: relicense under BSD
To get a uniform license for this file, relicense the mpv parts to BSD as well. But leave the door open for a later change to LGPL. (All non-Glumpy code was written within mpv, and all mpv authors have agreed to LGPL relicensing.) Closes #2688.
Diffstat (limited to 'video')
-rw-r--r--video/out/filter_kernels.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/video/out/filter_kernels.c b/video/out/filter_kernels.c
index d7657f84b7..fa3cb68041 100644
--- a/video/out/filter_kernels.c
+++ b/video/out/filter_kernels.c
@@ -14,18 +14,12 @@
*
* 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.
+ * This file can be distributed under the 3-clause license ("New BSD License").
*
- * 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You can alternatively redistribute the non-Glumpy parts of this file 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.
*/
#include <stddef.h>