[vlc-devel] commit: Fix compilation warning and alpha discarding. (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Aug 24 15:52:34 2008 +0200| [4db956cd67a474b718176d906862e5c7241bb36f] | committer: Antoine Cellerier 

Fix compilation warning and alpha discarding.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4db956cd67a474b718176d906862e5c7241bb36f
---

 modules/video_filter/blend.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/video_filter/blend.c b/modules/video_filter/blend.c
index 60874b2..fa118d0 100644
--- a/modules/video_filter/blend.c
+++ b/modules/video_filter/blend.c
@@ -851,6 +851,7 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst,
                                     int i_x_offset, int i_y_offset,
                                     int i_width, int i_height )
 {
+    VLC_UNUSED(p_dst_orig);
     int i_src2_pitch, i_dst_pitch;
     uint8_t *p_src2_y, *p_dst_y;
     uint8_t *p_src2_u, *p_dst_u;
@@ -951,7 +952,7 @@ static void BlendI420R16( filter_t *p_filter, picture_t *p_dst_pic,
 
             vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
                              (const uint16_t*)&p_src1[i_x * i_pix_pitch],
-                             r, g, b, 0xff, &p_filter->fmt_out.video );
+                             r, g, b, i_alpha, &p_filter->fmt_out.video );
         }
         if( i_y%2 == 1 )
         {