diff options
| author | Clément Bœsch <u@pkh.me> | 2016-11-26 17:01:50 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-11-27 20:46:20 +0100 |
| commit | 5d7be07a8b823238c881889faf0f1093bca1f062 (patch) | |
| tree | a1fa6822c5003c1b476df60dbbf4fa4fdd9f96e3 | |
| parent | d9883ded3450e456df5b7214fe464b4b92e917ef (diff) | |
| download | ffmpeg-5d7be07a8b823238c881889faf0f1093bca1f062.tar.gz | |
lavfi/f_ebur128: relicense to LGPL
All copyright holders have agreed to the relicensing.
Approved-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Approved-by: David Sedacca <sedacca@comcast.net>
Approved-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Approved-by: Jean First <jeanfirst@gmail.com>
Approved-by: Kyle Swanson <k@ylo.ph>
Approved-by: Michael Niedermayer <michael@niedermayer.cc>
Approved-by: Nicolas George <george@nsup.org>
Approved-by: Paul B Mahol <onemda@gmail.com>
Approved-by: Thilo Borgmann <thilo.borgmann@mail.de>
| -rw-r--r-- | LICENSE.md | 1 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavfilter/f_ebur128.c | 18 |
3 files changed, 9 insertions, 11 deletions
diff --git a/LICENSE.md b/LICENSE.md index a384fa0bef..640633c6af 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -26,7 +26,6 @@ Specifically, the GPL parts of FFmpeg are: - `tests/checkasm/*` - `tests/tiny_ssim.c` - the following filters in libavfilter: - - `f_ebur128.c` - `vf_blackframe.c` - `vf_boxblur.c` - `vf_colormatrix.c` @@ -3050,7 +3050,6 @@ cropdetect_filter_deps="gpl" delogo_filter_deps="gpl" deshake_filter_select="pixelutils" drawtext_filter_deps="libfreetype" -ebur128_filter_deps="gpl" eq_filter_deps="gpl" fftfilt_filter_deps="avcodec" fftfilt_filter_select="rdft" diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 983c889017..1fd85bbf79 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -3,19 +3,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 */ /** |