Mercurial > mplayer.hg
changeset 25415:a0a6541b1944
r25345 patched the wrong line.
Here's the right fix (100l to me, i deserved them)
Patch by Guillaume Lecerf.
| author | ben |
|---|---|
| date | Mon, 17 Dec 2007 19:35:30 +0000 |
| parents | 5c03a9bdf220 |
| children | a79a22add62a |
| files | vidix/radeon_vid.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/radeon_vid.c Mon Dec 17 15:49:54 2007 +0000 +++ b/vidix/radeon_vid.c Mon Dec 17 19:35:30 2007 +0000 @@ -1138,7 +1138,6 @@ besr.graphics_key_msk=0; besr.graphics_key_clr=0; besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND; - besr.merge_cntl |= 0x00000100; /* DISP_RGB_OFFSET_EN */ } static int find_chip(unsigned chip_id) @@ -3400,6 +3399,7 @@ besr.graphics_key_msk=0; besr.graphics_key_clr=0; besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND; + besr.merge_cntl |= 0x00000100; /* DISP_RGB_OFFSET_EN */ } radeon_fifo_wait(3); OUTREG(OV0_GRAPHICS_KEY_MSK, besr.graphics_key_msk);