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.

4 files changed, 17 insertions, 28 deletions

diff --git a/Copyright b/Copyright
index d021e10e3f..a1664aee99 100644
--- a/Copyright
+++ b/Copyright
@@ -71,8 +71,6 @@ The following files are still GPL only (--enable-lgpl disables them):
     stream/stream_smb.c             will stay GPLv3
     stream/stream_tv.c              will stay GPL
     stream/tv*                      will stay GPL
-    video/filter/vf_format.c        will be deleted
-    video/filter/vf_sub.c           will be deleted
     video/out/opengl/hwdec_vaglx.c  GPL
     video/out/vo_caca.c             unknown
     video/out/vo_direct3d.c         unknown
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;
 
diff --git a/wscript_build.py b/wscript_build.py
index f34ac80d3a..274ef663cd 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -376,9 +376,9 @@ def build(ctx):
         ( "video/filter/vf_buffer.c" ),
         ( "video/filter/vf_convert.c" ),
         ( "video/filter/vf_d3d11vpp.c",          "d3d-hwaccel" ),
-        ( "video/filter/vf_format.c",            "gpl" ),
+        ( "video/filter/vf_format.c" ),
         ( "video/filter/vf_lavfi.c" ),
-        ( "video/filter/vf_sub.c",               "gpl" ),
+        ( "video/filter/vf_sub.c" ),
         ( "video/filter/vf_vapoursynth.c",       "vapoursynth-core" ),
         ( "video/filter/vf_vavpp.c",             "vaapi" ),
         ( "video/filter/vf_vdpaupp.c",           "vdpau" ),