summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c2
-rw-r--r--src/demuxers/demux_avi.c2
-rw-r--r--src/demuxers/demux_matroska.c6
-rw-r--r--src/demuxers/demux_qt.c2
-rw-r--r--src/dxr3/dxr3_spu_encoder.c8
-rw-r--r--src/dxr3/video_out_dxr3.c8
-rw-r--r--src/input/input_v4l.c2
-rw-r--r--src/libw32dll/DirectShow/DS_VideoDecoder.c2
-rw-r--r--src/libw32dll/dmo/DMO_VideoDecoder.c2
-rw-r--r--src/post/deinterlace/xine_plugin.c2
-rw-r--r--src/post/goom/ifs.c2
-rw-r--r--src/post/goom/xine_goom.c4
-rw-r--r--src/video_out/video_out_directfb.c12
-rw-r--r--src/video_out/video_out_fb.c2
-rw-r--r--src/video_out/video_out_xcbxv.c4
-rw-r--r--src/video_out/video_out_xv.c4
-rw-r--r--src/video_out/video_out_xvmc.c4
-rw-r--r--src/video_out/video_out_xxmc.c8
-rw-r--r--src/video_out/vidix/drivers/mga_vid.c4
-rw-r--r--src/video_out/vidix/drivers/nvidia_vid.c4
-rw-r--r--src/video_out/vidix/drivers/savage_vid.c6
-rw-r--r--src/video_out/yuv2rgb.c8
-rw-r--r--src/xine-engine/alphablend.c2
23 files changed, 50 insertions, 50 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 9c977f417..9aab59977 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -514,7 +514,7 @@ static int asf_read_header (demux_asf_t *this) {
lprintf ("palette_count: %d\n", demux_stream->palette_count);
if (demux_stream->palette_count > 256) {
- lprintf ("number of colors exceeded 256 (%d)", demux_stream->palette_count);
+ lprintf ("number of colours exceeded 256 (%d)", demux_stream->palette_count);
demux_stream->palette_count = 256;
}
if ((asf_stream->private_data_length - sizeof(xine_bmiheader) - 11) >= (demux_stream->palette_count * 4)) {
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 544c19d76..6bb0b289c 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -949,7 +949,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
lprintf ("palette_count: %d\n", AVI->palette_count);
if (AVI->palette_count > 256) {
- lprintf ("number of colors exceeded 256 (%d)", AVI->palette_count);
+ lprintf ("number of colours exceeded 256 (%d)", AVI->palette_count);
AVI->palette_count = 256;
}
if ((strf_size - sizeof(xine_bmiheader)) >= (AVI->palette_count * 4)) {
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 4f3476049..b973c1caf 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -779,7 +779,7 @@ static int vobsub_parse_custom_colors(matroska_track_t *t, const char *start) {
use_custom_colors = 1;
else if (!strncasecmp(start, "OFF", 3) || (*start == '0'))
use_custom_colors = 0;
- lprintf("VobSub custom colors: %s\n", use_custom_colors ? "ON" : "OFF");
+ lprintf("VobSub custom colours: %s\n", use_custom_colors ? "ON" : "OFF");
if ((start = strstr(start, "colors:")) != NULL) {
start += 7;
while (isspace(*start))
@@ -793,7 +793,7 @@ static int vobsub_parse_custom_colors(matroska_track_t *t, const char *start) {
}
if (i == 4) {
t->sub_track->custom_colors = 4;
- lprintf("VobSub colors: %06x,%06x,%06x,%06x\n", t->sub_track->colors[0],
+ lprintf("VobSub colours: %06x,%06x,%06x,%06x\n", t->sub_track->colors[0],
t->sub_track->colors[1], t->sub_track->colors[2],
t->sub_track->colors[3]);
}
@@ -853,7 +853,7 @@ static void init_codec_vobsub(demux_matroska_t *this,
things_found |= vobsub_parse_size(track, start);
else if (!strncasecmp(start, "palette:", 8))
things_found |= vobsub_parse_palette(track, start);
- else if (!strncasecmp(start, "custom colors:", 14))
+ else if (!strncasecmp(start, "custom colours:", 14))
things_found |= vobsub_parse_custom_colors(track, start);
else if (!strncasecmp(start, "forced subs:", 12))
things_found |= vobsub_parse_forced_subs(track, start);
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index b9fadc804..a55a0aef3 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -1075,7 +1075,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
trak_atom[atom_pos + 0x1],
trak_atom[atom_pos + 0x2],
trak_atom[atom_pos + 0x3]);
- debug_atom_load(" %d RGB colors\n",
+ debug_atom_load(" %d RGB colours\n",
trak->stsd_atoms[k].video.palette_count);
for (j = 0; j < trak->stsd_atoms[k].video.palette_count;
j++)
diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c
index 1dcc13b77..2517063ac 100644
--- a/src/dxr3/dxr3_spu_encoder.c
+++ b/src/dxr3/dxr3_spu_encoder.c
@@ -167,11 +167,11 @@ static void create_histogram(spu_encoder_t *this)
#ifdef LOG
for (i = 0; i < OVL_PALETTE_SIZE; i++)
if (this->map[i])
- lprintf("histogram: color #%d 0x%.8x appears %d times\n",
+ lprintf("histogram: colour #%d 0x%.8x appears %d times\n",
i, this->overlay->color[i], this->map[i]);
for (i = 0; i < OVL_PALETTE_SIZE; i++)
if (this->clip_map[i])
- lprintf("histogram: clip color #%d 0x%.8x appears %d times\n",
+ lprintf("histogram: clip colour #%d 0x%.8x appears %d times\n",
i, this->overlay->hili_color[i], this->clip_map[i]);
#endif
}
@@ -209,7 +209,7 @@ static void generate_clut(spu_encoder_t *this)
}
#ifdef LOG
for (spu_color = 0; spu_color < 4; spu_color++)
- lprintf("spu color %d: 0x%.8x, trans: %d\n", spu_color,
+ lprintf("spu colour %d: 0x%.8x, trans: %d\n", spu_color,
this->color[spu_color], this->trans[spu_color]);
#endif
@@ -243,7 +243,7 @@ static void generate_clut(spu_encoder_t *this)
}
#ifdef LOG
for (spu_color = 0; spu_color < 4; spu_color++)
- lprintf("spu clip color %d: 0x%.8x, trans: %d\n", spu_color,
+ lprintf("spu clip colour %d: 0x%.8x, trans: %d\n", spu_color,
this->hili_color[spu_color], this->hili_trans[spu_color]);
#endif
}
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 73eb133e1..c51354157 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -431,13 +431,13 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
this->tv_switchable = 1;
this->widescreen_enabled = confnum - 2;
confstr = config->register_string(config, "dxr3.output.keycolor", "0x80a040",
- _("overlay colorkey value"), _("Hexadecimal RGB value of the key color.\n"
+ _("overlay colour key value"), _("Hexadecimal RGB value of the key colour.\n"
"You can try different values, if you experience windows becoming transparent "
"when using DXR3 overlay mode."), 20, NULL, NULL);
sscanf(confstr, "%x", &this->overlay.colorkey);
confstr = config->register_string(config, "dxr3.output.keycolor_interval", "50.0",
- _("overlay colorkey tolerance"), _("A greater value widens the tolerance for "
- "the overlay keycolor.\nYou can try lower values, if you experience windows "
+ _("overlay colour key tolerance"), _("A greater value widens the tolerance for "
+ "the overlay key colour.\nYou can try lower values, if you experience windows "
"becoming transparent when using DXR3 overlay mode, but parts of the image borders may "
"disappear when using a too low setting."), 20, NULL, NULL);
sscanf(confstr, "%f", &this->overlay.color_interval);
@@ -509,7 +509,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
if (dxr3_overlay_set_keycolor(&this->overlay) != 0)
xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
- "video_out_dxr3: setting the overlay keycolor failed.\n");
+ "video_out_dxr3: setting the overlay key colour failed.\n");
if (dxr3_overlay_set_attributes(&this->overlay) != 0)
xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
"video_out_dxr3: setting an overlay attribute failed.\n");
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 2316ef9ba..b43a2684a 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -882,7 +882,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
if (ret < 0) {
close (this->video_fd);
this->video_fd = -1;
- lprintf("Grab: no colorspace format found\n");
+ lprintf("Grab: no colour space format found\n");
return 0;
}
else
diff --git a/src/libw32dll/DirectShow/DS_VideoDecoder.c b/src/libw32dll/DirectShow/DS_VideoDecoder.c
index 44c6d26d7..c0a08d5e3 100644
--- a/src/libw32dll/DirectShow/DS_VideoDecoder.c
+++ b/src/libw32dll/DirectShow/DS_VideoDecoder.c
@@ -570,7 +570,7 @@ int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp
if (result != 0)
{
if (csp)
- printf("Warning: unsupported color space\n");
+ printf("Warning: unsupported colour space\n");
else
printf("Warning: unsupported bit depth\n");
diff --git a/src/libw32dll/dmo/DMO_VideoDecoder.c b/src/libw32dll/dmo/DMO_VideoDecoder.c
index 3ad85645a..7b25085f0 100644
--- a/src/libw32dll/dmo/DMO_VideoDecoder.c
+++ b/src/libw32dll/dmo/DMO_VideoDecoder.c
@@ -524,7 +524,7 @@ int DMO_VideoDecoder_SetDestFmt(DMO_VideoDecoder *this, int bits, unsigned int c
if (result != 0)
{
if (csp)
- printf("Warning: unsupported color space\n");
+ printf("Warning: unsupported colour space\n");
else
printf("Warning: unsupported bit depth\n");
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 99bd597f6..477e6812b 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -234,7 +234,7 @@ static char * get_static_help (void) {
"\n"
" Chroma_filter: DVD/MPEG2 use an interlaced image format that has "
"a very poor vertical chroma resolution. Upsampling the chroma for purposes "
- "of deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+ "of deinterlacing may cause some artifacts to occur (eg. colour stripes). Use "
"this option to blur the chroma vertically after deinterlacing to remove "
"the artifacts. Warning: cpu intensive.\n"
"\n"
diff --git a/src/post/goom/ifs.c b/src/post/goom/ifs.c
index af84b777b..4c7ec75d1 100644
--- a/src/post/goom/ifs.c
+++ b/src/post/goom/ifs.c
@@ -64,7 +64,7 @@ IFSPoint;
#define ifs_opts xlockmore_opts
#define DEFAULTS "*delay: 20000 \n" \
-"*ncolors: 100 \n"
+"*ncolours: 100 \n"
#define SMOOTH_COLORS
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 351c997ba..8cd06dbd6 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -221,8 +221,8 @@ static void *goom_init_plugin(xine_t *xine, void *data)
cfg->register_enum (cfg, "effects.goom.csc_method", 0,
goom_csc_methods,
- _("colorspace conversion method"),
- _("You can choose the colorspace conversion method used by goom.\n"
+ _("colour space conversion method"),
+ _("You can choose the colour space conversion method used by goom.\n"
"The available selections should be self-explaining."),
20, csc_method_changed_cb, this);
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 3e30f664d..3aa5bf66a 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1008,7 +1008,7 @@ static int directfb_set_property (vo_driver_t *this_gen,
if (value > 0xffffff)
value = 0xffffff;
xprintf (this->xine, XINE_VERBOSITY_DEBUG,
- "video_out_directfb: setting colorkey to 0x%06x.\n", value);
+ "video_out_directfb: setting colour key to 0x%06x.\n", value);
this->colorkey = value;
this->layer->SetDstColorKey (this->layer, (value & 0xff0000) >> 16,
(value & 0x00ff00) >> 8,
@@ -1266,7 +1266,7 @@ static void update_config_cb (void *data, xine_cfg_entry_t *entry) {
if (config.options != this->config.options) {
if (this->layer->SetConfiguration (this->layer, &config) != DFB_OK) {
xprintf (this->xine, XINE_VERBOSITY_LOG,
- "video_out_directfb: failed to set colorkeying to %d!\n",
+ "video_out_directfb: failed to set colour keying to %d!\n",
entry->num_value);
return;
}
@@ -1354,15 +1354,15 @@ static void init_config (directfb_driver_t *this) {
if (this->caps & DLCAPS_DST_COLORKEY) {
this->colorkeying = config->register_bool (config,
"video.device.directfb_colorkeying", this->colorkeying,
- _("enable video color key"),
- _("Enable using a color key to tell the graphics card "
+ _("enable video colour key"),
+ _("Enable using a colour key to tell the graphics card "
"where to overlay the video image."),
20, update_config_cb, (void *)this);
this->colorkey = config->register_range (config,
"video.device.directfb_colorkey", this->colorkey, 0, 0xffffff,
- _("video color key"),
- _("The color key is used to tell the graphics card "
+ _("video colour key"),
+ _("The colour key is used to tell the graphics card "
"where to overlay the video image. Try different values, "
"if you experience windows becoming transparent."),
10, update_config_cb, (void *)this);
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 78d23cd91..2f7fd2d57 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -755,7 +755,7 @@ static int get_fb_fix_screeninfo(int fd, struct fb_fix_screeninfo *fix, xine_t *
fix->type != FB_TYPE_PACKED_PIXELS)
{
xprintf(xine, XINE_VERBOSITY_LOG,
- _("video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+ _("video_out_fb: only packed truecolour/directcolour is supported (%d).\n"
" Check 'fbset -i' or try 'fbset -depth 16'.\n"), fix->visual);
return 0;
}
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index cb582baab..5b44ea12d 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1337,7 +1337,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xcbxv: using Xv port %d from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
xcb_xv_adaptor_info_name(adaptor_it.data));
this->xv_port = xv_port;
@@ -1444,7 +1444,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
adaptor_it.data->base_id,
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(xcb_xv_attribute_info_name(attribute_it.data), "XV_FILTER")) {
int xv_filter;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 07b1e1186..7ff7b64e5 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1380,7 +1380,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xv: using Xv port %ld from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
adaptor_info[adaptor_num].name);
UNLOCK_DISPLAY(this);
@@ -1497,7 +1497,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
adaptor_info[adaptor_num].base_id,
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 8f7b1defc..31d4c053d 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1451,7 +1451,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
int xvmc_double_buffer;
@@ -1742,7 +1742,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
else {
xprintf (xine, XINE_VERBOSITY_LOG,
_("video_out_xvmc: using Xv port %ld from adaptor %s\n"
- " for hardware colorspace conversion and scaling\n"),
+ " for hardware colour space conversion and scaling\n"),
xv_port, adaptor_info[adaptor_num].name);
if(IDCTaccel&XINE_VO_IDCT_ACCEL)
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index db5b753f5..2b27c3982 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2424,7 +2424,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xxmc: using Xv port %ld from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
adaptor_info[adaptor_num].name);
XUnlockDisplay(this->display);
@@ -2535,7 +2535,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
adaptor_info[adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
@@ -2647,8 +2647,8 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
10, xxmc_update_cpu_save, this);
this->reverse_nvidia_palette =
config->register_bool (config, "video.device.xvmc_nvidia_color_fix", 0,
- _("Fix buggy NVIDIA XvMC subpicture colors"),
- _("There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+ _("Fix buggy NVIDIA XvMC subpicture colours"),
+ _("There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n"
"look blue and vice versa. This option provides a workaround.\n"),
10, xxmc_update_nvidia_fix, this);
this->bob =
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/src/video_out/vidix/drivers/mga_vid.c
index eed2b9e65..edebc0c4f 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/src/video_out/vidix/drivers/mga_vid.c
@@ -425,7 +425,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
writeb(X_DATAREG, colkey_mask[3]);
- printf(MGA_MSG" Restored colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Restored colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
} else if (!colkey_saved) {
@@ -453,7 +453,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
colkey_mask[3]=(unsigned char)readb(X_DATAREG);
- printf(MGA_MSG" Saved colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Saved colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
}
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/src/video_out/vidix/drivers/nvidia_vid.c
index 34fa27cb7..e820d58e8 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/src/video_out/vidix/drivers/nvidia_vid.c
@@ -955,12 +955,12 @@ int vixSetGrKeys( const vidix_grkey_t * grkey){
if (grkey->ckey.op == CKEY_FALSE)
{
info->use_colorkey = 0;
- printf("[nvidia_vid] colorkeying disabled\n");
+ printf("[nvidia_vid] colour keying disabled\n");
}
else {
info->use_colorkey = 1;
info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
- printf("[nvidia_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+ printf("[nvidia_vid] set colour key 0x%x\n",info->vidixcolourkey);
}
if(info->d_width && info->d_height)rivatv_overlay_start(info,0);
return 0;
diff --git a/src/video_out/vidix/drivers/savage_vid.c b/src/video_out/vidix/drivers/savage_vid.c
index 2ac76198d..0ad7b0b15 100644
--- a/src/video_out/vidix/drivers/savage_vid.c
+++ b/src/video_out/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->vidixcolourkey);
}
//FIXME: freezes if streams arent enabled
SavageSetColorKeyOld();
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 0ca6537a7..c98dd518f 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -3220,7 +3220,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using MMXEXT for colorspace transform\n");
+ printf ("yuv2rgb: using MMXEXT for colour space transform\n");
#endif
}
@@ -3230,7 +3230,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using MMX for colorspace transform\n");
+ printf ("yuv2rgb: using MMX for colour space transform\n");
#endif
}
#endif
@@ -3241,12 +3241,12 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using medialib for colorspace transform\n");
+ printf ("yuv2rgb: using medialib for colour space transform\n");
#endif
}
#endif
if (this->yuv2rgb_fun == NULL) {
- lprintf ("no accelerated colorspace conversion found\n");
+ lprintf ("no accelerated colour space conversion found\n");
yuv2rgb_c_init (this);
}
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index 8fcc4c469..a7ab33cf8 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -1959,7 +1959,7 @@ static int xx44_paletteIndex(xx44_palette_t *p, int color, uint32_t clut)
}
if (p->max_used == p->size -1) {
- printf("video_out: Warning! Out of xx44 palette colors!\n");
+ printf("video_out: Warning! Out of xx44 palette colours!\n");
return 1;
}
p->cluts[p->max_used] = clut;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 14:13:54 +0000