From a3d9c49a188f63a65026cf5e1adb9ab0615aac86 Mon Sep 17 00:00:00 2001 From: David McPaul Date: Mon, 24 May 2010 09:43:24 +0000 Subject: [PATCH] Use the alpha from the source git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36922 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp | 2 +- .../media/media-add-ons/video_mixer/VideoMixerNodeProducer.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp b/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp index 0b5d131acf..7b89e61b72 100644 --- a/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp +++ b/src/add-ons/media/media-add-ons/video_mixer/BufferMixer.cpp @@ -62,7 +62,7 @@ BufferMixer::Merge(BBuffer *input, BBuffer *output) { c1 = *source++; c2 = *source++; c3 = *source++; - alpha = 128; source++; + alpha = *source++; *destination++ = ALPHABLEND(c1, *destination, alpha); *destination++ = ALPHABLEND(c2, *destination, alpha); *destination++ = ALPHABLEND(c3, *destination, alpha); diff --git a/src/add-ons/media/media-add-ons/video_mixer/VideoMixerNodeProducer.cpp b/src/add-ons/media/media-add-ons/video_mixer/VideoMixerNodeProducer.cpp index 5fbf2a335e..ab4b86e196 100644 --- a/src/add-ons/media/media-add-ons/video_mixer/VideoMixerNodeProducer.cpp +++ b/src/add-ons/media/media-add-ons/video_mixer/VideoMixerNodeProducer.cpp @@ -113,6 +113,7 @@ status_t VideoMixerNode::DisposeOutputCookie(int32 cookie) { fprintf(stderr,"VideoMixerNode(BBufferProducer)::DisposeOutputCookie\n"); // nothing to do since our cookies are part of the vector iterator + return B_OK; } status_t VideoMixerNode::SetBufferGroup(