[MPlayer-cvslog] r28262 - in trunk: libaf/af_surround.c libmpcodecs/vf_remove_logo.c

[diego]

Author: diego
Date: Mon Jan  5 12:06:28 2009
New Revision: 28262

Log:
Fix two more instances of nonstandard license headers.

Modified:
   trunk/libaf/af_surround.c
   trunk/libmpcodecs/vf_remove_logo.c

Modified: trunk/libaf/af_surround.c
==============================================================================
--- trunk/libaf/af_surround.c	Mon Jan  5 11:52:13 2009	(r28261)
+++ trunk/libaf/af_surround.c	Mon Jan  5 12:06:28 2009	(r28262)
@@ -1,24 +1,26 @@
-/* 
-   This is an libaf filter to do simple decoding of matrixed surround
-   sound.  This will provide a (basic) surround-sound effect from
-   audio encoded for Dolby Surround, Pro Logic etc.
-
- * This program is free software; you can redistribute it and/or modify
+/*
+ * Filter to do simple decoding of matrixed surround sound.
+ * This will provide a (basic) surround-sound effect from
+ * audio encoded for Dolby Surround, Pro Logic etc.
+ *
+ * original author: Steve Davies <steve at daviesfam.org>
+ *
+ * This file is part of MPlayer.
+ *
+ * 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.
  *
- * This program is distributed in the hope that it will be useful,
+ * MPlayer 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Original author: Steve Davies <steve at daviesfam.org>
-*/
+ */
 
 /* The principle:  Make rear channels by extracting anti-phase data
    from the front channels, delay by 20ms and feed to rear in anti-phase

Modified: trunk/libmpcodecs/vf_remove_logo.c
==============================================================================
--- trunk/libmpcodecs/vf_remove_logo.c	Mon Jan  5 11:52:13 2009	(r28261)
+++ trunk/libmpcodecs/vf_remove_logo.c	Mon Jan  5 12:06:28 2009	(r28262)
@@ -1,29 +1,25 @@
 /*
-Copyright 2005 Robert Edele.
-
-e-mail: yartrebo at earthlink.net
-
-This program 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.
-
-This program 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 Public License for more
-details.
-
-You should have reveived a copy of the GNU General Public License
-along with this program; if not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA
-
-__________________________________________________________________________
-| Robert Edele                                           Fri. 4-Feb-2005 |
-| This program loads a .pgm mask file showing where a logo is and uses   |
-| a blur transform to remove the logo.                                   |
-|________________________________________________________________________|
-*/
+ * This filter loads a .pgm mask file showing where a logo is and uses
+ * a blur transform to remove the logo.
+ *
+ * Copyright (C) 2005 Robert Edele <yartrebo at earthlink.net>
+ *
+ * This file is part of MPlayer.
+ *
+ * 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 /**
  * \file vf_remove_logo.c