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/cyberblade_vid.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/cyberblade_vid.c')
-rw-r--r-- | vidix/cyberblade_vid.c | 27 |
1 files changed, 11 insertions, 16 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 |