aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-10-26 19:47:28 +0000
committerPaul B Mahol <onemda@gmail.com>2013-10-27 20:29:07 +0000
commit75b2bbe21d93ce18b0362f1deaa9f11bfab75e8c (patch)
tree1ce49061a26cdf1908749975ab5e3c4b010d1b31
parentb1348eb68b432041b2557b9073590cf0fa60ff14 (diff)
downloadffmpeg-75b2bbe21d93ce18b0362f1deaa9f11bfab75e8c.tar.gz
libavfilter/vf_noise: relicense to LGPL
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--LICENSE1
-rwxr-xr-xconfigure1
-rw-r--r--libavfilter/vf_noise.c12
3 files changed, 6 insertions, 8 deletions
diff --git a/LICENSE b/LICENSE
index 6e56e3b036..1840d69179 100644
--- a/LICENSE
+++ b/LICENSE
@@ -36,7 +36,6 @@ Specifically, the GPL parts of FFmpeg are
- vf_kerndeint.c
- vf_mcdeint.c
- vf_mp.c
- - vf_noise.c
- vf_owdenoise.c
- vf_perspective.c
- vf_phase.c
diff --git a/configure b/configure
index cb6318b5ef..46a9adef37 100755
--- a/configure
+++ b/configure
@@ -2228,7 +2228,6 @@ mp_filter_deps="gpl avcodec swscale inline_asm"
mpdecimate_filter_deps="gpl avcodec"
mptestsrc_filter_deps="gpl"
negate_filter_deps="lut_filter"
-noise_filter_deps="gpl"
perspective_filter_deps="gpl"
resample_filter_deps="avresample"
ocv_filter_deps="libopencv"
diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c
index 8eb3ee19b6..ffa628dab8 100644
--- a/libavfilter/vf_noise.c
+++ b/libavfilter/vf_noise.c
@@ -5,17 +5,17 @@
* 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
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * 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
+ * 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
*/