summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich J Wareham <richwareham@users.sourceforge.net>2001-07-26 00:18:45 +0000
committerRich J Wareham <richwareham@users.sourceforge.net>2001-07-26 00:18:45 +0000
commit4042284ccba79fe453dfca7b4d45edba31d36d48 (patch)
tree15b4a9e66e5a48524e50076ddc71161ca685e9e7 /src
parent5720d1a5ca1544769c98f10c4032ffacd7c8ae9e (diff)
downloadxine-lib-4042284ccba79fe453dfca7b4d45edba31d36d48.tar.gz
xine-lib-4042284ccba79fe453dfca7b4d45edba31d36d48.tar.bz2
Reverted a small error introduced into alphablend.c
CVS patchset: 349 CVS date: 2001/07/26 00:18:45
Diffstat (limited to 'src')
-rw-r--r--src/video_out/alphablend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 641578f61..e0d6c075e 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -225,8 +225,8 @@ void blend_rgb32 (uint8_t * img, vo_overlay_t * img_overl, int dst_width,
BLEND (32, img, img_overl, dst_width, dst_height);
}
-// #define BLEND_YUV(dst, src, o) (((src)*o + ((dst)*(0xf-o)))/0xf)
-#define BLEND_YUV(dst, src, o) ( (((uint16_t)src)*o + ((uint16_t)dst)*(0xf-o)) >> 4 )
+#define BLEND_YUV(dst, src, o) (((src)*o + ((dst)*(0xf-o)))/0xf)
+
/* FIXME: my_clut should disappear once I find out how to get the clut from the MPEG2 stream. */
/* It looks like it comes from the ,IFO file, so will have to wait for IFO parser in xine.
* Here is an extract of another DVD player (oms)