Mercurial > mplayer.hg
changeset 25272:21bd7360eb03
sync with vidix.sf.net r318: resolve bitfield collision in vidix radeon driver (patch by Guillaume Lecerf)
| author | ben |
|---|---|
| date | Tue, 04 Dec 2007 21:56:18 +0000 |
| parents | 4ba5a1593296 |
| children | a07e6b9e36c1 |
| files | vidix/radeon_vid.c |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/radeon_vid.c Tue Dec 04 18:10:20 2007 +0000 +++ b/vidix/radeon_vid.c Tue Dec 04 21:56:18 2007 +0000 @@ -272,20 +272,20 @@ #define R_FAMILY 0x000000FF #define R_100 0x00000001 #define R_120 0x00000002 -#define R_150 0x00000003 -#define R_200 0x00000004 -#define R_250 0x00000005 -#define R_280 0x00000006 -#define R_300 0x00000007 -#define R_350 0x00000008 -#define R_370 0x00000010 -#define R_380 0x00000020 -#define R_420 0x00000040 -#define R_430 0x00000080 -#define R_480 0x00000100 -#define R_520 0x00000200 -#define R_530 0x00000400 -#define R_580 0x00000800 +#define R_150 0x00000004 +#define R_200 0x00000008 +#define R_250 0x00000010 +#define R_280 0x00000020 +#define R_300 0x00000040 +#define R_350 0x00000080 +#define R_370 0x00000100 +#define R_380 0x00000200 +#define R_420 0x00000400 +#define R_430 0x00000800 +#define R_480 0x00001000 +#define R_520 0x00002000 +#define R_530 0x00004000 +#define R_580 0x00008000 #define R_OVL_SHIFT 0x01000000 #define R_INTEGRATED 0x02000000 #define R_PCIE 0x04000000