summaryrefslogtreecommitdiff
path: root/src/video_out/yuv2rgb.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-05 00:44:49 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-05 00:44:49 +0100
commitc81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch)
treeb39027bf19757a904f9d306085d8744046f24a1f /src/video_out/yuv2rgb.c
parent119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff)
parenta2a95425350da93551388acdca8a00818a34c317 (diff)
downloadxine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz
xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2
Merge from 1.2.
Diffstat (limited to 'src/video_out/yuv2rgb.c')
-rw-r--r--src/video_out/yuv2rgb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index fbaef3080..4a44c59d9 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -1264,7 +1264,7 @@ static scale_line_func_t find_scale_line_func(int step) {
int src_step;
int dest_step;
scale_line_func_t func;
- char *desc;
+ const char *desc; /* FIXME: consider moving this to a char[] to avoid reloc */
} scale_line[] = {
{ 15, 16, scale_line_15_16, "dvd 4:3(pal)" },
{ 45, 64, scale_line_45_64, "dvd 16:9(pal), fullscreen(1024x768)" },
@@ -3222,7 +3222,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
}
@@ -3232,7 +3232,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
@@ -3243,12 +3243,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);
}