diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-23 20:56:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-23 20:56:50 +0200 |
| commit | 0406d951209df261970424256d76f293649ec140 (patch) | |
| tree | 622259272e33995869f234cf18f76201e5272241 /vidix | |
| parent | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (diff) | |
| parent | 39b7c1576d826cfd72f34a3491a094d07b3d7041 (diff) | |
| download | mpv-0406d951209df261970424256d76f293649ec140.tar.bz2 mpv-0406d951209df261970424256d76f293649ec140.tar.xz | |
Merge svn changes up to r28348
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/cyberblade_regs.h | 2 | ||||
| -rw-r--r-- | vidix/dhahelperwin/dhahelper.c | 2 | ||||
| -rw-r--r-- | vidix/dhahelperwin/dhahelper.h | 2 | ||||
| -rw-r--r-- | vidix/sis_bridge.c | 4 | ||||
| -rw-r--r-- | vidix/sis_vid.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/vidix/cyberblade_regs.h b/vidix/cyberblade_regs.h index 07063262cb..b2fbcb1670 100644 --- a/vidix/cyberblade_regs.h +++ b/vidix/cyberblade_regs.h @@ -1,5 +1,5 @@ /* - * Copyright 1992-2000 by Alan Hourihane, Wigan, England. + * Copyright 1992-2000 by Alan Hourihane, Wigan, England * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/vidix/dhahelperwin/dhahelper.c b/vidix/dhahelperwin/dhahelper.c index 0b68791c85..2289738792 100644 --- a/vidix/dhahelperwin/dhahelper.c +++ b/vidix/dhahelperwin/dhahelper.c @@ -1,7 +1,7 @@ /* * direct hardware access under Windows NT/2000/XP * - * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>. + * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de> * Patched to compile with MinGW by Kevin Kofler: * Copyright (c) 2007 Kevin Kofler * diff --git a/vidix/dhahelperwin/dhahelper.h b/vidix/dhahelperwin/dhahelper.h index eb96ea4c4d..a41880a97d 100644 --- a/vidix/dhahelperwin/dhahelper.h +++ b/vidix/dhahelperwin/dhahelper.h @@ -1,7 +1,7 @@ /* * direct hardware access under Windows NT/2000/XP * - * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>. + * Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de> * * This file is part of MPlayer. * diff --git a/vidix/sis_bridge.c b/vidix/sis_bridge.c index 4dd8fe92c3..f143754a9a 100644 --- a/vidix/sis_bridge.c +++ b/vidix/sis_bridge.c @@ -2,9 +2,9 @@ * VIDIX driver for SiS chipsets. * Video bridge detection for SiS 300 and 310/325 series. * - * Copyright (C) 2003 Jake Page, Sugar Media. + * Copyright (C) 2003 Jake Page, Sugar Media * Based on SiS Xv driver - * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria. + * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria * * This file is part of MPlayer. * diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c index a2d1d98919..c47f1fb603 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -2,8 +2,8 @@ * VIDIX driver for SiS chipsets. * Based on SiS Xv driver * - * Copyright (C) 2003 Jake Page, Sugar Media. - * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria. + * Copyright (C) 2003 Jake Page, Sugar Media + * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria * 2003/10/08 integrated into mplayer/vidix architecture -- Alex Beregszaszi * * This file is part of MPlayer. |