diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
| commit | 97049a8985f7f9cadff0d61d65961c5cfd490829 (patch) | |
| tree | 32db874d5040bc0a42f20b5a9f5adc1712471373 /src/video_out | |
| parent | 7ae03d031828b8595ef6a441717b3b5402f6ce0d (diff) | |
| parent | 9f35b93d3ee2a40444c538247cfc5b05b4b0bf89 (diff) | |
| download | xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.gz xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.bz2 | |
Merge from 1.1 branch.
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/x11osd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c index f1e0656d1..dbfa53ec7 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.c @@ -436,7 +436,7 @@ void x11osd_clear(x11osd *osd) osd->clean = WIPED; } -#define TRANSPARENT 0xffffffff +#define X11OSD_TRANSPARENT 0xffffffff #define saturate(n, l, u) ((n) < (l) ? (l) : ((n) > (u) ? (u) : (n))) @@ -526,13 +526,13 @@ void x11osd_blend(x11osd *osd, vo_overlay_t *overlay) } } else { - palette[use_clip_palette][j] = TRANSPARENT; + palette[use_clip_palette][j] = X11OSD_TRANSPARENT; } } max_palette_colour[use_clip_palette] = overlay->rle[i].color; } - if(palette[use_clip_palette][overlay->rle[i].color] != TRANSPARENT) { + if(palette[use_clip_palette][overlay->rle[i].color] != X11OSD_TRANSPARENT) { XSetForeground(osd->display, osd->gc, palette[use_clip_palette][overlay->rle[i].color]); XFillRectangle(osd->display, osd->bitmap, osd->gc, overlay->x + x, overlay->y + y, width, 1); if(osd->mode==X11OSD_SHAPED) |