summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-12-16 23:17:11 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-28 11:20:48 +0100
commitd5e7f01090a0b738e3df4323910875151f7dbb94 (patch)
tree4777b98c48f9aece15724a128046a4e165edd1dc
parent18ff210efb8d158f3e8c79508d99a52eaebf9d48 (diff)
downloadffmpeg-d5e7f01090a0b738e3df4323910875151f7dbb94.tar.gz
avfilter/vf_geq: Relicense to LGPL
All authors who have code in this under GPL agreed. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--LICENSE.md1
-rwxr-xr-xconfigure1
-rw-r--r--libavfilter/vf_geq.c18
3 files changed, 9 insertions, 11 deletions
diff --git a/LICENSE.md b/LICENSE.md
index e2ab65cf5e..613070e1b6 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -35,7 +35,6 @@ Specifically, the GPL parts of FFmpeg are:
- `vf_eq.c`
- `vf_find_rect.c`
- `vf_fspp.c`
- - `vf_geq.c`
- `vf_histeq.c`
- `vf_hqdn3d.c`
- `vf_kerndeint.c`
diff --git a/configure b/configure
index eec43c3b06..43dc409fe6 100755
--- a/configure
+++ b/configure
@@ -3503,7 +3503,6 @@ freezedetect_filter_select="scene_sad"
frei0r_filter_deps="frei0r libdl"
frei0r_src_filter_deps="frei0r libdl"
fspp_filter_deps="gpl"
-geq_filter_deps="gpl"
headphone_filter_select="fft"
histeq_filter_deps="gpl"
hqdn3d_filter_deps="gpl"
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index e3267e331f..e30c752d9a 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -4,19 +4,19 @@
*
* This file is part of FFmpeg.
*
- * FFmpeg 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.
+ * FFmpeg 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.
*
* FFmpeg 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**