[MPlayer-cvslog] r25443 - trunk/vidix/radeon_vid.c

[ben]

Author: ben
Date: Mon Dec 17 20:35:30 2007
New Revision: 25443

Log:
r25345 patched the wrong line.
Here's the right fix (100l to me, i deserved them)
Patch by Guillaume Lecerf.



Modified:
   trunk/vidix/radeon_vid.c

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Mon Dec 17 20:35:30 2007
@@ -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);