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/dha.c | |
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/dha.c')
-rw-r--r-- | vidix/dha.c | 34 |
1 files changed, 17 insertions, 17 deletions
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" |