summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-17 19:35:30 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-17 19:35:30 +0000
commitb411a839c2be3459ac236f06fd614644af32991f (patch)
treeba9534b9adccde1ec67c92593982c31aee9edfcc /vidix
parent891a1f1451487deba3c17019c09a5780823f97c8 (diff)
downloadmpv-b411a839c2be3459ac236f06fd614644af32991f.tar.bz2
mpv-b411a839c2be3459ac236f06fd614644af32991f.tar.xz
r25345 patched the wrong line.
Here's the right fix (100l to me, i deserved them) Patch by Guillaume Lecerf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25443 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/radeon_vid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c
index bc8363e611..628e90fcec 100644
--- a/vidix/radeon_vid.c
+++ b/vidix/radeon_vid.c
@@ -1138,7 +1138,6 @@ static void radeon_vid_make_default(void)
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 @@ static int set_gr_key( void )
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);