[FFmpeg-devel] avfilter/vf_cropdetect: change license to LGPL

Submitted by Aman Gupta on Nov. 14, 2017, 10:35 p.m.

Details

Message ID 20171114223539.72605-1-ffmpeg@tmm1.net
State New
Headers show

Commit Message

Aman Gupta Nov. 14, 2017, 10:35 p.m.
From: Aman Gupta <aman@tmm1.net>

This filter was imported from mplayer's libmpcodecs/vf_cropdetect.c, and
marked as GPL when originally copied over.

On the mplayer side, it was authored originally by arpi and subsequently touched by
the following contributors. See https://github.com/pigoz/mplayer-svn/commits/master/libmpcodecs/vf_cropdetect.c

  arpi
  albeu
  diego
  reimar
  michael
  reynaldo
  lucabe
  cehoyos

Of these contributors, all except the last two granted their permission to relicense
mplayer changes to LGPL. See https://github.com/mpv-player/mpv/wiki/List-of-MPlayer-LGPL-relicensing-agreements

The change by lucabe was to remove an include header, and the change by cehoyos was to
change whitespace. Both are trivial and can be ignored for copyright purposes. See
https://github.com/pigoz/mplayer-svn/commit/6da0237a4#diff-2d400db883ad8bca0e5d6a78f12613fd
and https://github.com/pigoz/mplayer-svn/commit/04d069fcb#diff-2d400db883ad8bca0e5d6a78f12613fd

The import into ffmpeg was done by Stefano Sabatini. It was then touched by the following
contributors, who specifically made changes to the filter. This does not include
commits which changed this file but were part of larger refactorings that changed
lavfi APIs and other LGPL filters as well. See
https://github.com/FFmpeg/FFmpeg/commits/master/libavfilter/vf_cropdetect.c

  Stefano Sabatini
  Michael Niedermayer
  Anton Khirnov
  Clément Bœsch
  Paul B Mahol
  Carl Eugen Hoyos
  Vittorio Giovara
  Ganesh Ajjanagadde

The people above are CC'd on this patch for their permission to relicense vf_cropdetect as LGPL.
---
 configure                   |  1 -
 libavfilter/vf_cropdetect.c | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

Comments

Carl Eugen Hoyos Nov. 15, 2017, 10:19 p.m.
2017-11-14 23:35 GMT+01:00 Aman Gupta <ffmpeg@tmm1.net>:
> From: Aman Gupta <aman@tmm1.net>
>
> This filter was imported from mplayer's libmpcodecs/vf_cropdetect.c, and
> marked as GPL when originally copied over.
>
> On the mplayer side, it was authored originally by arpi and subsequently touched by
> the following contributors. See https://github.com/pigoz/mplayer-svn/commits/master/libmpcodecs/vf_cropdetect.c
>
>   arpi
>   albeu
>   diego
>   reimar
>   michael
>   reynaldo
>   lucabe
>   cehoyos

This list looks incomplete;-(

Carl Eugen
Paul B Mahol Nov. 16, 2017, 10:44 a.m.
On 11/15/17, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2017-11-14 23:35 GMT+01:00 Aman Gupta <ffmpeg@tmm1.net>:
>> From: Aman Gupta <aman@tmm1.net>
>>
>> This filter was imported from mplayer's libmpcodecs/vf_cropdetect.c, and
>> marked as GPL when originally copied over.
>>
>> On the mplayer side, it was authored originally by arpi and subsequently
>> touched by
>> the following contributors. See
>> https://github.com/pigoz/mplayer-svn/commits/master/libmpcodecs/vf_cropdetect.c
>>
>>   arpi
>>   albeu
>>   diego
>>   reimar
>>   michael
>>   reynaldo
>>   lucabe
>>   cehoyos
>
> This list looks incomplete;-(

You are living genius.

>
> Carl Eugen
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Clément Bœsch Nov. 16, 2017, 11:02 a.m.
On Tue, Nov 14, 2017 at 02:35:39PM -0800, Aman Gupta wrote:
[...]
> The import into ffmpeg was done by Stefano Sabatini. It was then touched by the following
> contributors, who specifically made changes to the filter. This does not include
> commits which changed this file but were part of larger refactorings that changed
> lavfi APIs and other LGPL filters as well. See
> https://github.com/FFmpeg/FFmpeg/commits/master/libavfilter/vf_cropdetect.c
> 
>   Stefano Sabatini
>   Michael Niedermayer
>   Anton Khirnov
>   Clément Bœsch
>   Paul B Mahol
>   Carl Eugen Hoyos
>   Vittorio Giovara
>   Ganesh Ajjanagadde
> 
> The people above are CC'd on this patch for their permission to relicense vf_cropdetect as LGPL.

Sure, OK for me.

You need to update LICENSE.md btw.
Aman Gupta Nov. 16, 2017, 9:25 p.m.
On Tue, Nov 14, 2017 at 2:35 PM, Aman Gupta <ffmpeg@tmm1.net> wrote:

> From: Aman Gupta <aman@tmm1.net>
>
> This filter was imported from mplayer's libmpcodecs/vf_cropdetect.c, and
> marked as GPL when originally copied over.
>
> On the mplayer side, it was authored originally by arpi and subsequently
> touched by
> the following contributors. See https://github.com/pigoz/
> mplayer-svn/commits/master/libmpcodecs/vf_cropdetect.c
>
>   arpi
>   albeu
>   diego
>   reimar
>   michael
>   reynaldo
>   lucabe
>   cehoyos
>
> Of these contributors, all except the last two granted their permission to
> relicense
> mplayer changes to LGPL. See https://github.com/mpv-player/
> mpv/wiki/List-of-MPlayer-LGPL-relicensing-agreements
>
> The change by lucabe was to remove an include header, and the change by
> cehoyos was to
> change whitespace. Both are trivial and can be ignored for copyright
> purposes. See
> https://github.com/pigoz/mplayer-svn/commit/6da0237a4#diff-
> 2d400db883ad8bca0e5d6a78f12613fd
> and https://github.com/pigoz/mplayer-svn/commit/04d069fcb#diff-
> 2d400db883ad8bca0e5d6a78f12613fd
>
> The import into ffmpeg was done by Stefano Sabatini. It was then touched
> by the following
> contributors, who specifically made changes to the filter. This does not
> include
> commits which changed this file but were part of larger refactorings that
> changed
> lavfi APIs and other LGPL filters as well. See
> https://github.com/FFmpeg/FFmpeg/commits/master/
> libavfilter/vf_cropdetect.c
>
>   Stefano Sabatini
>   Michael Niedermayer
>   Anton Khirnov
>   Clément Bœsch
>   Paul B Mahol
>   Carl Eugen Hoyos
>   Vittorio Giovara
>   Ganesh Ajjanagadde
>
> The people above are CC'd on this patch for their permission to relicense
> vf_cropdetect as LGPL.
>

I received an OK from Ganesh.

---------- Forwarded message ----------
From: yV7e6RyE gAQ0A4k4 <gajjanagadde@gmail.com>
Date: Tue, Nov 14, 2017 at 4:16 PM
Subject: Re: [PATCH] avfilter/vf_cropdetect: change license to LGPL
To: Aman Gupta <ffmpeg@tmm1.net>


I am fine with the license change.

Best wishes,
Ganesh


> ---
>  configure                   |  1 -
>  libavfilter/vf_cropdetect.c | 18 +++++++++---------
>  2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/configure b/configure
> index 3788f26956..c1bdea9fa5 100755
> --- a/configure
> +++ b/configure
> @@ -3185,7 +3185,6 @@ coreimage_filter_extralibs="-framework OpenGL"
>  coreimagesrc_filter_deps="coreimage appkit"
>  coreimagesrc_filter_extralibs="-framework OpenGL"
>  cover_rect_filter_deps="avcodec avformat gpl"
> -cropdetect_filter_deps="gpl"
>  deinterlace_qsv_filter_deps="libmfx"
>  deinterlace_vaapi_filter_deps="vaapi"
>  delogo_filter_deps="gpl"
> diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c
> index 7c7d0b953a..84abbe714c 100644
> --- a/libavfilter/vf_cropdetect.c
> +++ b/libavfilter/vf_cropdetect.c
> @@ -2,19 +2,19 @@
>   * Copyright (c) 2002 A'rpi
>   * 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
>   */
>
>  /**
> --
> 2.14.2
>
>

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index 3788f26956..c1bdea9fa5 100755
--- a/configure
+++ b/configure
@@ -3185,7 +3185,6 @@  coreimage_filter_extralibs="-framework OpenGL"
 coreimagesrc_filter_deps="coreimage appkit"
 coreimagesrc_filter_extralibs="-framework OpenGL"
 cover_rect_filter_deps="avcodec avformat gpl"
-cropdetect_filter_deps="gpl"
 deinterlace_qsv_filter_deps="libmfx"
 deinterlace_vaapi_filter_deps="vaapi"
 delogo_filter_deps="gpl"
diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c
index 7c7d0b953a..84abbe714c 100644
--- a/libavfilter/vf_cropdetect.c
+++ b/libavfilter/vf_cropdetect.c
@@ -2,19 +2,19 @@ 
  * Copyright (c) 2002 A'rpi
  * 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
  */
 
 /**