Merged vout_DatePicture into vout_DisplayPicture.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index bdaa32b100a7a87defdde48d0f0d37bbe7d4b594..404a0fffaed203a0b03799aaeb99dd618b479a90 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -584,13 +584,12 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
     }
 
     picture_Copy( p_outpic, p_inpic );
-    vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date );
 
     if( p_pic )
-    p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic,
-                                    p_pic, p_sys->posx, p_sys->posy,
-                                    p_logo->i_alpha != -1 ? p_logo->i_alpha
-                                    : p_logo_list->i_alpha );
+        p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic,
+                                        p_pic, p_sys->posx, p_sys->posy,
+                                        p_logo->i_alpha != -1 ? p_logo->i_alpha
+                                        : p_logo_list->i_alpha );
 
     vout_DisplayPicture( p_sys->p_vout, p_outpic );
 }