diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpcodecs/vf_remove_logo.c | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpcodecs/vf_remove_logo.c')
| -rw-r--r-- | libmpcodecs/vf_remove_logo.c | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c index d378fec59c..919c17455d 100644 --- a/libmpcodecs/vf_remove_logo.c +++ b/libmpcodecs/vf_remove_logo.c @@ -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 |