diff mbox

[FFmpeg-devel,3/5] avfilter/vf_geq: Relicense to LGPL

Message ID 20191216231946.11260-3-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Dec. 16, 2019, 11:19 p.m. UTC
All authors who have code in this under GPL agreed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavfilter/vf_geq.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Marton Balint Dec. 17, 2019, 12:13 a.m. UTC | #1
On Tue, 17 Dec 2019, Michael Niedermayer wrote:

> All authors who have code in this under GPL agreed.
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavfilter/vf_geq.c | 18 +++++++++---------

You should also remove the gpl dependency from configure.

Thanks,
Marton

> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
> index e3267e331f..e30c752d9a 100644
> --- a/libavfilter/vf_geq.c
> +++ b/libavfilter/vf_geq.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
>  */
> 
> /**
> -- 
> 2.24.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Lou Logan Dec. 17, 2019, 12:40 a.m. UTC | #2
On Tue, 17 Dec 2019 01:13:15 +0100 (CET)
Marton Balint <cus@passwd.hu> wrote:

> 
> You should also remove the gpl dependency from configure.

...and update LICENSE.md.
Michael Niedermayer Dec. 27, 2019, 9:44 p.m. UTC | #3
On Mon, Dec 16, 2019 at 03:40:39PM -0900, Lou Logan wrote:
> On Tue, 17 Dec 2019 01:13:15 +0100 (CET)
> Marton Balint <cus@passwd.hu> wrote:
> 
> > 
> > You should also remove the gpl dependency from configure.
> 
> ...and update LICENSE.md.

will apply with these changes

thx

[...]
diff mbox

Patch

diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index e3267e331f..e30c752d9a 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.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
  */
 
 /**