From patchwork Sat Nov 26 16:24:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 1566 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp954763vsb; Sat, 26 Nov 2016 08:21:59 -0800 (PST) X-Received: by 10.28.224.5 with SMTP id x5mr11826532wmg.70.1480177319378; Sat, 26 Nov 2016 08:21:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u128si19037736wmf.96.2016.11.26.08.21.59; Sat, 26 Nov 2016 08:21:59 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83048689D63; Sat, 26 Nov 2016 18:21:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kimiko.pkh.me (pkh.me [5.196.73.185]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C337689A6A for ; Sat, 26 Nov 2016 18:21:46 +0200 (EET) Received: from localhost (kimiko.pkh.me [local]) by kimiko.pkh.me (OpenSMTPD) with ESMTPA id 9d6e39eb; Sat, 26 Nov 2016 16:24:46 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2016 17:24:44 +0100 Message-Id: <20161126162444.23591-1-u@pkh.me> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] lavfi/ebur128: relicense to LGPL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" All copyright holders have agreed to the relicensing. Approved-by: Andreas Cadhalpun Approved-by: David Sedacca Approved-by: Ganesh Ajjanagadde Approved-by: Jean First Approved-by: Kyle Swanson Approved-by: Michael Niedermayer Approved-by: Nicolas George Approved-by: Paul B Mahol Approved-by: Thilo Borgmann --- I plan to push this soon. Thanks to all contributors for agreeing to the relicensing. --- LICENSE.md | 1 - configure | 1 - libavfilter/f_ebur128.c | 18 +++++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a384fa0..640633c 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` diff --git a/configure b/configure index d0c0056..a5e0a02 100755 --- a/configure +++ b/configure @@ -3036,7 +3036,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 983c889..1fd85bb 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 */ /**