Clément, On Fri, Sep 5, 2014 at 12:03 PM, Clément Bœsch <u...@pkh.me> wrote:
> On Fri, Sep 05, 2014 at 12:01:20PM +0200, Pascal Massimino wrote: > > On Fri, Sep 5, 2014 at 11:57 AM, Stefano Sabatini <stefa...@gmail.com> > > wrote: > > > > > On date Friday 2014-09-05 11:50:35 +0200, Clément Bœsch encoded: > > > > On Fri, Sep 05, 2014 at 11:47:42AM +0200, Pascal Massimino wrote: > > > > > Hi, > > > > > > > > > > should have been LGPL. Kudos to Carl for spotting that. > > > > > > > > > > /skal > > > > > > > > > From cd067fd2f7ae77b6be950fe2e841b9c285208612 Mon Sep 17 00:00:00 > 2001 > > > > > From: skal <pascal.massim...@gmail.com> > > > > > > > > > > > While at it, can you fix your username in git config? > > > > > > > > "skal" doesn't have any legal value and can cause problems in the > future. > > > > > > +1, that's a common complaint we heard about FFmpeg. > > > > > > > should be ok now. > > > From 06219db79655b1ef806a1bf7df94479a9348e73c Mon Sep 17 00:00:00 2001 > > From: Pascal Massimino <pascal.massim...@gmail.com> > > Date: Fri, 5 Sep 2014 11:59:03 +0200 > > Subject: [PATCH] fix license header: should have been LGPL. > > > > avfilter/x86/idet: fix license header (GPL -> LGPL) > Done, new patch attached. [...]
From 878344fb23b54bb957c4b86cc4a330192c853c1a Mon Sep 17 00:00:00 2001 From: Pascal Massimino <pascal.massim...@gmail.com> Date: Fri, 5 Sep 2014 11:59:03 +0200 Subject: [PATCH] avfilter/x86/idet: fix license header (GPL -> LGPL) --- libavfilter/vf_idet.h | 12 ++++++------ libavfilter/x86/vf_idet.asm | 41 ++++++++++++++++++++++------------------- libavfilter/x86/vf_idet_init.c | 12 ++++++------ 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/libavfilter/vf_idet.h b/libavfilter/vf_idet.h index 3820e94..0550690 100644 --- a/libavfilter/vf_idet.h +++ b/libavfilter/vf_idet.h @@ -2,17 +2,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 */ diff --git a/libavfilter/x86/vf_idet.asm b/libavfilter/x86/vf_idet.asm index fb29804..35f0e07 100644 --- a/libavfilter/x86/vf_idet.asm +++ b/libavfilter/x86/vf_idet.asm @@ -1,22 +1,25 @@ -; ***************************************************************************** -; * x86-optimized functions for idet filter -; * -; * 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 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. -; * -; * 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. -; ****************************************************************************** +;***************************************************************************** +;* x86-optimized functions for idet filter +;* +;* Copyright (C) 2014 Pascal Massimino (pascal.massim...@gmail.com) +;* Copyright (c) 2014 Neil Birkbeck (birkb...@google.com) +;* +;* This file is part of FFmpeg. +;* +;* 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 +;* Lesser General Public License for more details. +;* +;* 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 +;****************************************************************************** %include "libavutil/x86/x86util.asm" diff --git a/libavfilter/x86/vf_idet_init.c b/libavfilter/x86/vf_idet_init.c index 2203437..fb9ad83 100644 --- a/libavfilter/x86/vf_idet_init.c +++ b/libavfilter/x86/vf_idet_init.c @@ -2,17 +2,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 */ -- 2.1.0.rc2.206.gedb03e5
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
