diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /contrib/vidix/drivers/savage_vid.c | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'contrib/vidix/drivers/savage_vid.c')
| -rw-r--r-- | contrib/vidix/drivers/savage_vid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c index 2ac76198d..17040cc15 100644 --- a/contrib/vidix/drivers/savage_vid.c +++ b/contrib/vidix/drivers/savage_vid.c @@ -370,7 +370,7 @@ static void SavageSetColorKeyOld(void) blue = info->vidixcolorkey & 0x000000FF; if( !info->vidixcolorkey ) { - printf("SavageSetColorKey disabling colorkey\n"); + printf("SavageSetColorKey disabling colour key\n"); OUTREG( COL_CHROMA_KEY_CONTROL_REG, 0 ); OUTREG( CHROMA_KEY_UPPER_BOUND_REG, 0 ); OUTREG( BLEND_CONTROL_REG, 0 ); @@ -1134,13 +1134,13 @@ vixSetGrKeys (const vidix_grkey_t * grkey) { info->use_colorkey = 0; info->vidixcolorkey=0; - printf("[savage_vid] colorkeying disabled\n"); + printf("[savage_vid] colour keying disabled\n"); } else { info->use_colorkey = 1; info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue); - printf("[savage_vid] set colorkey 0x%x\n",info->vidixcolorkey); + printf("[savage_vid] set colour key 0x%x\n",info->vidixcolorkey); } //FIXME: freezes if streams arent enabled SavageSetColorKeyOld(); |