[vlc-commits] Reimport gradfun from libav, update copyright holders and license

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Nov 13 16:00:03 2012 +0100| [01a111867fdf6104e6cd0120b49fd6e0326f4cc0] | committer: Jean-Baptiste Kempf

Reimport gradfun from libav, update copyright holders and license

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01a111867fdf6104e6cd0120b49fd6e0326f4cc0
---

 modules/video_filter/gradfun.c |    4 +++-
 modules/video_filter/gradfun.h |   25 +++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 3e47011..4665fe9 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -1,11 +1,13 @@
 /*****************************************************************************
- * gradfun.c: wrapper for the gradfun filter from mplayer
+ * gradfun.c: wrapper for the gradfun filter from libav
  *****************************************************************************
  * Copyright (C) 2010 Laurent Aimar
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
+ * Based on the work of: Nolan Lum and Loren Merritt
+ *
  * This program 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
diff --git a/modules/video_filter/gradfun.h b/modules/video_filter/gradfun.h
index 23b4be3..7094c6d 100644
--- a/modules/video_filter/gradfun.h
+++ b/modules/video_filter/gradfun.h
@@ -1,21 +1,22 @@
 /*
- * Copyright (C) 2009 Loren Merritt <lorenm at u.washignton.edu>
+ * Copyright (c) 2010 Nolan Lum <nol888 at gmail.com>
+ * Copyright (c) 2009 Loren Merritt <lorenm at u.washignton.edu>
  *
- * This file is part of MPlayer.
+ * This file is part of Libav.
  *
- * MPlayer 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.
+ * Libav 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.
  *
- * MPlayer is distributed in the hope that it will be useful,
+ * Libav 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 MPlayer; 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*