[Ffmpeg-devel] overall license review - adding proper license headers

[Diego Biurrun]

On Fri, Sep 01, 2006 at 04:13:47PM +0200, Diego Biurrun wrote:
> 
> [...]

I stumbled over another (the last?) issue, libavcodec/sparc/vis.h is
marked as GPL, although the initial commit log message says they can be
used as LGPL with permission from the author.  The other file in that
directory, libavcodec/sparc/dsputil_vis.c, has a completely confused
license header that claims both GPL and LGPL.  I'll apply the attached
patch and switch both to LPGL proper by mid-week if I don't hear any
objections.

Diego
-------------- next part --------------
Index: libavcodec/sparc/dsputil_vis.c
===================================================================
--- libavcodec/sparc/dsputil_vis.c	(revision 6596)
+++ libavcodec/sparc/dsputil_vis.c	(working copy)
@@ -4,18 +4,18 @@
  *
  * 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 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 Lesser 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
  */
 
Index: libavcodec/sparc/vis.h
===================================================================
--- libavcodec/sparc/vis.h	(revision 6597)
+++ libavcodec/sparc/vis.h	(working copy)
@@ -2,21 +2,20 @@
  * vis.h
  * Copyright (C) 2003 David S. Miller <davem at redhat.com>
  *
- * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
- * See http://libmpeg2.sourceforge.net/ for updates.
+ * This file is part of FFmpeg.
  *
- * mpeg2dec 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.
  *
- * mpeg2dec is distributed in the hope that it will be useful,
+ * 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 this program; 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
  */