summaryrefslogtreecommitdiff
authorPaul B Mahol <onemda@gmail.com>2013-09-03 17:07:53 (GMT)
committer Paul B Mahol <onemda@gmail.com>2013-09-03 17:21:06 (GMT)
commit771e2e59e2afeba6f195645678645b8c874e59a2 (patch)
tree00991d12fda774e651c0aca8bf65b3a46af2ade8
parent6053812814055314b082030b9fcb6ccc9926c146 (diff)
downloadffmpeg-771e2e59e2afeba6f195645678645b8c874e59a2.zip
ffmpeg-771e2e59e2afeba6f195645678645b8c874e59a2.tar.gz
ffmpeg-771e2e59e2afeba6f195645678645b8c874e59a2.tar.bz2
lavfi/hue: relicense to LGPL with permission by all contributors
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat
-rw-r--r--LICENSE1
-rwxr-xr-xconfigure1
-rw-r--r--libavfilter/vf_hue.c18
3 files changed, 9 insertions, 11 deletions
diff --git a/LICENSE b/LICENSE
index f765ce8..12b08c2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -33,7 +33,6 @@ Specifically, the GPL parts of FFmpeg are
- vf_geq.c
- vf_histeq.c
- vf_hqdn3d.c
- - vf_hue.c
- vf_kerndeint.c
- vf_mcdeint.c
- vf_mp.c
diff --git a/configure b/configure
index 62f258a..fe4350d 100755
--- a/configure
+++ b/configure
@@ -2205,7 +2205,6 @@ frei0r_src_filter_extralibs='$ldl'
geq_filter_deps="gpl"
histeq_filter_deps="gpl"
hqdn3d_filter_deps="gpl"
-hue_filter_deps="gpl"
interlace_filter_deps="gpl"
kerndeint_filter_deps="gpl"
mcdeint_filter_deps="avcodec gpl"
diff --git a/libavfilter/vf_hue.c b/libavfilter/vf_hue.c
index e5017fb..83f006c 100644
--- a/libavfilter/vf_hue.c
+++ b/libavfilter/vf_hue.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
*/
/**