diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /vidix | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/pm3_regs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vidix/pm3_regs.h b/vidix/pm3_regs.h index 2ec5555a79..727e873e3d 100644 --- a/vidix/pm3_regs.h +++ b/vidix/pm3_regs.h @@ -1051,8 +1051,6 @@ #define PM3FillRectanglePosition_XOffset(x) ((x)&0xffff) #define PM3FillRectanglePosition_YOffset(y) (((y)&0xffff)<<16) -#if 1 - /********************************************** * GLINT Permedia3 Macros * ***********************************************/ @@ -1109,5 +1107,5 @@ do{ \ RAMDAC_SET_INDEX(index); \ temp = READ_REG(PM3RD_IndexedData); \ } -#endif + #endif /* MPLAYER_PM3_REGS_H */ |