* modules/video_filter/blend.c: added an i_alpha parameter for blending

include/vlc_filter.h

@@ -55,7 +55,7 @@ struct filter_t
     block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
     void                ( * pf_video_blend )  ( filter_t *, picture_t *,
                                                 picture_t *, picture_t *,
-                                                int, int );
+                                                int, int, int );
 
     subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
     subpicture_t *      ( *pf_render_string ) ( filter_t *, block_t * );

modules/video_filter/logo.c

@@ -441,7 +441,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     vout_DatePicture( p_sys->p_vout, p_outpic, p_pic->date );
 
     p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic,
-                                    p_sys->p_pic, p_sys->posx, p_sys->posy );
+                                    p_sys->p_pic, p_sys->posx, p_sys->posy,
+                                    255 );
 
     vout_DisplayPicture( p_sys->p_vout, p_outpic );
 }

src/video_output/vout_subpictures.c

@@ -725,7 +725,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
                     p_fmt->i_height;
 
            p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
-                p_pic_src, &p_region->picture, i_x_offset, i_y_offset );
+                p_pic_src, &p_region->picture, i_x_offset, i_y_offset, 255 );
 
             p_region = p_region->p_next;
         }