diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /drivers/mga_vid.h | |
parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'drivers/mga_vid.h')
-rw-r--r-- | drivers/mga_vid.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/drivers/mga_vid.h b/drivers/mga_vid.h index 48ae522463..0e9dcfc8f9 100644 --- a/drivers/mga_vid.h +++ b/drivers/mga_vid.h @@ -1,15 +1,24 @@ /* - * - * mga_vid.h - * - * Copyright (C) 1999 Aaron Holtzman - * * Matrox MGA G200/G400 YUV Video Interface module Version 0.1.0 - * * BES == Back End Scaler - * - * This software has been released under the terms of the GNU Public - * license. See http://www.gnu.org/copyleft/gpl.html for details. + * + * Copyright (C) 1999 Aaron Holtzman + * + * This file is part of mga_vid. + * + * mga_vid 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. + * + * mga_vid 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 mga_vid; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MGA_VID_H |