diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix/s3_regs.h | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix/s3_regs.h')
-rw-r--r-- | vidix/s3_regs.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/vidix/s3_regs.h b/vidix/s3_regs.h index 440681ab5e..0add1bea54 100644 --- a/vidix/s3_regs.h +++ b/vidix/s3_regs.h @@ -1,3 +1,27 @@ +/* + * S3 chipsets registers definition. + * + * Copyright (C) 2004 Reza Jelveh + * Thanks to Alex Deucher for Support + * Trio/Virge support by Michael Kostylev + * + * 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. + */ + #ifndef MPLAYER_SAVAGE_REGS_H #define MPLAYER_SAVAGE_REGS_H |