summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/video_out/alphablend.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 639d04486..7a09b8899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ xine-lib (1-rc1)
* fix some asf demuxer bugs
seq number handling (helps a lot with mms live video streams)
frame duration bug with "still" frames
+ * fix colors of YUY2 overlay blending
xine-lib (1-rc0a)
* includes ffmpeg's MPEG encode in dist tarball (fixes DXR3 support)
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 794d602ae..3eb98adc8 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -1015,7 +1015,7 @@ void blend_yuy2 (uint8_t * dst_img, vo_overlay_t * img_overl,
if (o && mask) {
l = rlelen>>1;
- if( x & 1 ) {
+ if( !((x_off+x) & 1) ) {
*(((uint8_t *)&yuy2) + 0) = my_clut[clr].y;
*(((uint8_t *)&yuy2) + 1) = my_clut[clr].cb;
*(((uint8_t *)&yuy2) + 2) = my_clut[clr].y;