diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /vidix | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'vidix')
-rw-r--r-- | vidix/cyberblade_vid.c | 27 | ||||
-rw-r--r-- | vidix/dha.c | 34 | ||||
-rw-r--r-- | vidix/dha.h | 34 | ||||
-rw-r--r-- | vidix/dhahelperwin/dhahelper.c | 14 | ||||
-rw-r--r-- | vidix/dhahelperwin/dhahelper.h | 13 | ||||
-rw-r--r-- | vidix/dhahelperwin/dhasetup.c | 34 | ||||
-rw-r--r-- | vidix/drivers.c | 6 | ||||
-rw-r--r-- | vidix/drivers.h | 6 | ||||
-rw-r--r-- | vidix/fourcc.h | 13 | ||||
-rw-r--r-- | vidix/ivtv_vid.c | 55 | ||||
-rw-r--r-- | vidix/mach64.h | 12 | ||||
-rw-r--r-- | vidix/mach64_vid.c | 12 | ||||
-rw-r--r-- | vidix/mga_vid.c | 24 | ||||
-rw-r--r-- | vidix/mtrr.c | 7 | ||||
-rw-r--r-- | vidix/nvidia_vid.c | 12 | ||||
-rw-r--r-- | vidix/pci_db2c.awk | 6 | ||||
-rw-r--r-- | vidix/pm2_vid.c | 6 | ||||
-rw-r--r-- | vidix/pm3_vid.c | 6 | ||||
-rw-r--r-- | vidix/radeon.h | 13 | ||||
-rw-r--r-- | vidix/radeon_vid.c | 21 | ||||
-rw-r--r-- | vidix/s3_vid.c | 14 | ||||
-rw-r--r-- | vidix/sis_bridge.c | 12 | ||||
-rw-r--r-- | vidix/sis_defs.h | 12 | ||||
-rw-r--r-- | vidix/sis_regs.h | 12 | ||||
-rw-r--r-- | vidix/sis_vid.c | 14 | ||||
-rw-r--r-- | vidix/unichrome_vid.c | 20 | ||||
-rw-r--r-- | vidix/vidix.h | 31 | ||||
-rw-r--r-- | vidix/vidixlib.c | 31 | ||||
-rw-r--r-- | vidix/vidixlib.h | 31 |
29 files changed, 256 insertions, 276 deletions
diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c index 7f0a8f3eac..6a0c4231e8 100644 --- a/vidix/cyberblade_vid.c +++ b/vidix/cyberblade_vid.c @@ -1,7 +1,12 @@ /* * VIDIX driver for VIA Cyberblade/i1 chipsets. + * Brightness/Contrast controls disabled for the time being - they were + * seriously degrading picture quality, especially with TV-Out. + * * Copyright (C) 2002 Alastair M. Robinson * http://www.blackfiveservices.co.uk/EPIAVidix.shtml + * based on Permedia 3 driver by Måns Rullgård + * thanks to Gilles Frattini for bugfixes * * This file is part of MPlayer. * @@ -15,22 +20,12 @@ * 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 - * - * Based on Permedia 3 driver by Måns Rullgård - * Thanks to Gilles Frattini for bugfixes. - * - * Changes: - * 18/01/03 - * MMIO is no longer used, sidestepping cache issues on EPIA-800 - * TV-Out modes are now better supported - this should be the end - * of the magenta stripes :) - * Brightness/Contrast controls disabled for the time being - they were - * seriously degrading picture quality, especially with TV-Out. - * - * To Do: + * 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. + */ + +/* To Do: * Implement Hue/Saturation controls * Support / Test multiple frames * Test colour-key code more extensively diff --git a/vidix/dha.c b/vidix/dha.c index 832d849067..95ffee6eb1 100644 --- a/vidix/dha.c +++ b/vidix/dha.c @@ -2,6 +2,20 @@ * VIDIX Direct Hardware Access (DHA). * Copyright (C) 2002 Nick Kurshev * + * 1996/10/27 - Robin Cutshaw (robin@xfree86.org) + * XFree86 3.3.3 implementation + * 1999 - Øyvind Aabling. + * Modified for GATOS/win/gfxdump. + * + * 2002 - library implementation by Nick Kurshev + * - dhahelper and some changes by Alex Beregszaszi + * + * supported OSes: SVR4, UnixWare, SCO, Solaris, + * FreeBSD, NetBSD, 386BSD, BSDI BSD/386, + * Linux, Mach/386, ISC + * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd) + * original location: www.linuxvideo.org/gatos + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify @@ -14,23 +28,9 @@ * 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 - * - * 1996/10/27 - Robin Cutshaw (robin@xfree86.org) - * XFree86 3.3.3 implementation - * 1999 - Øyvind Aabling. - * Modified for GATOS/win/gfxdump. - * - * 2002 - library implementation by Nick Kurshev - * - dhahelper and some changes by Alex Beregszaszi - * - * Supported O/S's: SVR4, UnixWare, SCO, Solaris, - * FreeBSD, NetBSD, 386BSD, BSDI BSD/386, - * Linux, Mach/386, ISC - * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd) - * Original location: www.linuxvideo.org/gatos + * 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. */ #include "config.h" diff --git a/vidix/dha.h b/vidix/dha.h index bd92d2752b..c19ed0fc07 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -2,6 +2,20 @@ * VIDIX Direct Hardware Access (DHA). * Copyright (C) 2002 Nick Kurshev * + * 1996/10/27 - Robin Cutshaw (robin@xfree86.org) + * XFree86 3.3.3 implementation + * 1999 - Øyvind Aabling. + * Modified for GATOS/win/gfxdump. + * + * 2002 - library implementation by Nick Kurshev + * - dhahelper and some changes by Alex Beregszaszi + * + * supported OSes: SVR4, UnixWare, SCO, Solaris, + * FreeBSD, NetBSD, 386BSD, BSDI BSD/386, + * Linux, Mach/386, ISC + * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd) + * original location: www.linuxvideo.org/gatos + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify @@ -14,23 +28,9 @@ * 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 - * - * 1996/10/27 - Robin Cutshaw (robin@xfree86.org) - * XFree86 3.3.3 implementation - * 1999 - Øyvind Aabling. - * Modified for GATOS/win/gfxdump. - * - * 2002 - library implementation by Nick Kurshev - * - dhahelper and some changes by Alex Beregszaszi - * - * Supported O/S's: SVR4, UnixWare, SCO, Solaris, - * FreeBSD, NetBSD, 386BSD, BSDI BSD/386, - * Linux, Mach/386, ISC - * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd) - * Original location: www.linuxvideo.org/gatos + * 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. */ #ifndef MPLAYER_DHA_H diff --git a/vidix/dhahelperwin/dhahelper.c b/vidix/dhahelperwin/dhahelper.c index b68f397c6d..0b68791c85 100644 --- a/vidix/dhahelperwin/dhahelper.c +++ b/vidix/dhahelperwin/dhahelper.c @@ -1,5 +1,6 @@ -/****************************************************************************** - * dhahelper.c: direct hardware access under Windows NT/2000/XP +/* + * direct hardware access under Windows NT/2000/XP + * * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>. * Patched to compile with MinGW by Kevin Kofler: * Copyright (c) 2007 Kevin Kofler @@ -16,11 +17,10 @@ * 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 - * - *****************************************************************************/ + * 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. + */ #if defined(_MSC_VER) diff --git a/vidix/dhahelperwin/dhahelper.h b/vidix/dhahelperwin/dhahelper.h index 2cb84c9eb8..eb96ea4c4d 100644 --- a/vidix/dhahelperwin/dhahelper.h +++ b/vidix/dhahelperwin/dhahelper.h @@ -1,5 +1,6 @@ -/****************************************************************************** - * dhahelper.c: direct hardware access under Windows NT/2000/XP +/* + * direct hardware access under Windows NT/2000/XP + * * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>. * * This file is part of MPlayer. @@ -14,10 +15,10 @@ * 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 - *****************************************************************************/ + * 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. + */ #ifndef MPLAYER_DHAHELPER_H #define MPLAYER_DHAHELPER_H diff --git a/vidix/dhahelperwin/dhasetup.c b/vidix/dhahelperwin/dhasetup.c index d51f0015df..be593edae5 100644 --- a/vidix/dhahelperwin/dhasetup.c +++ b/vidix/dhahelperwin/dhasetup.c @@ -1,24 +1,28 @@ -/* dhasetup - dhahelper setup program +/* + * dhasetup - dhahelper setup program * - * Copyright (c) 2004 - 2007 Sascha Sommer (MPlayer) + * Copyright (c) 2004 - 2007 Sascha Sommer (MPlayer) * - * Some parts from dhasetup.c source code <http://svn.tilp.info/cgi-bin/viewcvs.cgi/libticables/trunk/src/win32/dha/> + * some parts from dhasetup.c source code + * http://svn.tilp.info/cgi-bin/viewcvs.cgi/libticables/trunk/src/win32/dha/ * - * Copyright (C) 2007 Romain Lievin (tilp) + * Copyright (C) 2007 Romain Lievin (tilp) * - * 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 file is part of MPlayer. * - * 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 General Public License for more details. + * 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. * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 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. */ #include <windows.h> diff --git a/vidix/drivers.c b/vidix/drivers.c index 6259b6994b..cf26cf94dc 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -14,9 +14,9 @@ * 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 + * 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. */ #include <stdlib.h> diff --git a/vidix/drivers.h b/vidix/drivers.h index f8f94e421a..1dbe0b8417 100644 --- a/vidix/drivers.h +++ b/vidix/drivers.h @@ -14,9 +14,9 @@ * 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 + * 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. */ #ifndef MPLAYER_DRIVERS_H diff --git a/vidix/fourcc.h b/vidix/fourcc.h index 82136e0bb5..3b4c7919b5 100644 --- a/vidix/fourcc.h +++ b/vidix/fourcc.h @@ -1,5 +1,9 @@ /* * VIDIX FourCC. + * + * This interface is based on v4l2, fbvid.h, mga_vid.h projects + * and personally my ideas. + * * Copyright (C) 2002 Nick Kurshev * * This file is part of MPlayer. @@ -14,12 +18,9 @@ * 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 - * - * This interface is based on v4l2, fbvid.h, mga_vid.h projects - * and personally my ideas. + * 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. */ #ifndef MPLAYER_FOURCC_H diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c index 5c4bde9704..151f7e9c3f 100644 --- a/vidix/ivtv_vid.c +++ b/vidix/ivtv_vid.c @@ -1,36 +1,25 @@ -/** - VIDIX driver for Hauppauge PVR 350. - - Copyright 2007 Lutz Koschorreck. - - Based on genfb_vid.c and ivtv_xv.c - - 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - 09.05.2007 Lutz Koschorreck - First version: Tested with ivtv-0.10.1, xine-ui-0.99.5, xine-lib-1.1.6 - 20.05.2007 Lutz Koschorreck - Some Scaling and zooming problems fixed. By default the vidix driver now - controlls the setting of alphablending. So there is no need to use - ivtvfbctl anymore. To disable this feature set the following environment - variable:VIDIXIVTVALPHA=disable. Special thanx to Ian Armstrong. - 23.07.2007 Lutz Koschorreck - Support for 2.6.22 kernel added. PCI scan added. - 07.10.2007 Lutz Koschorreck - Restore old alpha value correctly. Fix capability struct values. -**/ +/* + * VIDIX driver for Hauppauge PVR 350 + * + * Copyright 2007 Lutz Koschorreck + * Based on genfb_vid.c and ivtv_xv.c + * + * 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. + */ #include <errno.h> #include <stdio.h> diff --git a/vidix/mach64.h b/vidix/mach64.h index 34227a1dab..2ccfa5aa03 100644 --- a/vidix/mach64.h +++ b/vidix/mach64.h @@ -1,6 +1,9 @@ /* * VIDIX driver for ATI Mach64 and 3DRage chipsets. + * * Copyright (C) 2002 Nick Kurshev + * This file is based on sources from + * radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org) * * This file is part of MPlayer. * @@ -14,12 +17,9 @@ * 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 - * - * This file is based on sources from - * radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org) + * 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. */ #ifndef MPLAYER_MACH64_H diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index 9f65ccbdd5..162542f313 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -1,6 +1,9 @@ /* * VIDIX driver for ATI Mach64 and 3DRage chipsets. + * * Copyright (C) 2002 Nick Kurshev + * This file is based on sources from + * GATOS (gatos.sf.net) and X11 (www.xfree86.org) * * This file is part of MPlayer. * @@ -14,12 +17,9 @@ * 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 - * - * This file is based on sources from - * GATOS (gatos.sf.net) and X11 (www.xfree86.org) + * 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. */ #include <errno.h> diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c index b0cef043d5..a2c02d1a2b 100644 --- a/vidix/mga_vid.c +++ b/vidix/mga_vid.c @@ -1,6 +1,12 @@ /* * VIDIX driver for Matrox chipsets. + * * Copyright (C) 2002 Alex Beregszaszi + * Original sources from Aaron Holtzman (C) 1999. + * module skeleton based on gutted agpgart module by Jeff Hartmann + * <slicer@ionet.net> + * YUY2 support and double buffering added by A'rpi/ESP-team + * brightness/contrast support by Nick Kurshev/Dariush Pietrzak (eyck) * * This file is part of MPlayer. * @@ -14,18 +20,12 @@ * 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 - * - * Original sources from Aaron Holtzman (C) 1999. - * Module skeleton based on gutted agpgart module by Jeff Hartmann - * <slicer@ionet.net> - * YUY2 support added by A'rpi/ESP-team - double buffering added by A'rpi/ESP-team - * Brightness/contrast support by Nick Kurshev/Dariush Pietrzak (eyck) - * - * TODO: + * 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. + */ + +/* TODO: * - fix memory size detection (current reading pci userconfig isn't * working as requested - returns the max avail. ram on arch?) * - translate all non-english comments to english diff --git a/vidix/mtrr.c b/vidix/mtrr.c index 9b0d11dbfd..bda566f68e 100644 --- a/vidix/mtrr.c +++ b/vidix/mtrr.c @@ -14,10 +14,9 @@ * 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 - * + * 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. */ #include "config.h" diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c index b10b54f306..07d698bd92 100644 --- a/vidix/nvidia_vid.c +++ b/vidix/nvidia_vid.c @@ -1,6 +1,9 @@ /* * VIDIX driver for nVidia chipsets. + * * Copyright (C) 2003-2004 Sascha Sommer + * This file is based on sources from RIVATV (rivatv.sf.net) + * Multi buffer support and TNT2 fixes by Dmitry Baryshkov. * * This file is part of MPlayer. * @@ -14,12 +17,9 @@ * 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 - * - * This file is based on sources from RIVATV (rivatv.sf.net) - * Multi buffer support and TNT2 fixes by Dmitry Baryshkov. + * 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. */ #include <errno.h> diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index eecdb31714..4f6a084bda 100644 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -20,9 +20,9 @@ # 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 +# 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 BEGIN { diff --git a/vidix/pm2_vid.c b/vidix/pm2_vid.c index b12bf967d7..a1058d6882 100644 --- a/vidix/pm2_vid.c +++ b/vidix/pm2_vid.c @@ -14,9 +14,9 @@ * 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 + * 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. */ #include <errno.h> diff --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c index a2a3087560..0ee01e0734 100644 --- a/vidix/pm3_vid.c +++ b/vidix/pm3_vid.c @@ -14,9 +14,9 @@ * 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 + * 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. */ #include <errno.h> diff --git a/vidix/radeon.h b/vidix/radeon.h index f22704dd53..f7b07914d8 100644 --- a/vidix/radeon.h +++ b/vidix/radeon.h @@ -1,5 +1,9 @@ /* * VIDIX driver for ATI Rage128 and Radeon chipsets. + * + * This file is based on radeonfb, X11, GATOS sources + * and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts) + * * Copyright (C) 2002 Nick Kurshev * * This file is part of MPlayer. @@ -14,12 +18,9 @@ * 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 - * - * This file is based on radeonfb, X11, GATOS sources - * and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts) + * 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. */ #ifndef MPLAYER_RADEON_H diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index e0e0dd9bce..affa266285 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -1,6 +1,11 @@ /* * VIDIX driver for ATI Rage128 and Radeon chipsets. + * + * This file is based on sources from + * GATOS (gatos.sf.net) and X11 (www.xfree86.org) + * * Copyright (C) 2002 Nick Kurshev + * support for fglrx drivers by Marcel Naziri (zwobbl@zwobbl.de) * * This file is part of MPlayer. * @@ -14,19 +19,9 @@ * 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 - * - * This file is based on sources from - * GATOS (gatos.sf.net) and X11 (www.xfree86.org) - * - * Changes: - * - 31.12.2002 - * added support for fglrx drivers by Marcel Naziri (zwobbl@zwobbl.de) - * - 6.04.2004 - * fixes to allow compiling vidix without X11 (broken in original patch) - * - PowerPC support by Alex Beregszaszi + * 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. */ #include <errno.h> diff --git a/vidix/s3_vid.c b/vidix/s3_vid.c index 332e765483..98904cedd8 100644 --- a/vidix/s3_vid.c +++ b/vidix/s3_vid.c @@ -1,6 +1,9 @@ /* * VIDIX driver for S3 chipsets. + * * Copyright (C) 2004 Reza Jelveh + * Thanks to Alex Deucher for Support + * Trio/Virge support by Michael Kostylev * * This file is part of MPlayer. * @@ -14,14 +17,9 @@ * 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 - * - * Thanks to Alex Deucher for Support - * - * Trio/Virge support by Michael Kostylev - * + * 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. */ #include <errno.h> |