aboutsummaryrefslogtreecommitdiffhomepage
path: root/video/filter
diff options
context:
space:
mode:
authorGravatar wm4 <wm4@nowhere>2017-11-29 18:20:29 +0100
committerGravatar wm4 <wm4@nowhere>2017-11-29 18:22:23 +0100
commit194ec2b47bb75391ec71d180ba0f5fd0b5dbec8e (patch)
tree3e3d0d57a1e030b49095517ef6ac4af2511d1534 /video/filter
parent12cac1d1119a0dab3469dc52c851b8eb528d63b7 (diff)
vf_sub, vf_format: change license to LGPL
They were added to the "to deleted" list and never relicensed, because I thought I'd delete them early. But it's possible that they'll stay in mpv for a longer time, so relicense them. Still leaving them as deprecated and scheduled for removal, so they can still be dropped once there is a better way to deal with them, if they get annoying, or if a better mechanism is found that makes them unnecessary. All contributors agreed. There are some minor changes by people who did not agree, but these are all not relevant or have been removed.
Diffstat (limited to 'video/filter')
-rw-r--r--video/filter/vf_format.c19
-rw-r--r--video/filter/vf_sub.c20
2 files changed, 15 insertions, 24 deletions
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index ebbbc584fc..aab30855d6 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -1,18 +1,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>
@@ -32,11 +32,6 @@
#include "options/m_option.h"
-#include "config.h"
-#if !HAVE_GPL
-#error GPL only
-#endif
-
struct vf_priv_s {
int fmt;
int outfmt;
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index fdaee80937..065a8c66c7 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -3,20 +3,21 @@
*
* 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 "config.h"
#include <stdio.h>
@@ -40,11 +41,6 @@
#include "options/m_option.h"
-#include "config.h"
-#if !HAVE_GPL
-#error GPL only
-#endif
-
struct vf_priv_s {
int opt_top_margin, opt_bottom_margin;