Mercurial > mplayer.hg
changeset 28227:089d5341f9bc
Fix two more instances of nonstandard license headers.
| author | diego |
|---|---|
| date | Mon, 05 Jan 2009 11:06:28 +0000 |
| parents | de6ff5c366ea |
| children | 96ba36bd6123 |
| files | libaf/af_surround.c libmpcodecs/vf_remove_logo.c |
| diffstat | 2 files changed, 34 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/libaf/af_surround.c Mon Jan 05 10:52:13 2009 +0000 +++ b/libaf/af_surround.c Mon Jan 05 11:06:28 2009 +0000 @@ -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@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@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
--- a/libmpcodecs/vf_remove_logo.c Mon Jan 05 10:52:13 2009 +0000 +++ b/libmpcodecs/vf_remove_logo.c Mon Jan 05 11:06:28 2009 +0000 @@ -1,29 +1,25 @@ /* -Copyright 2005 Robert Edele. - -e-mail: yartrebo@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@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