Qt4 - pixmaps again. Removing bigger images, useless ones, and cleaning.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index d13b6ee03e0ed8fbb0d66e10f25c1a0a2d367dad..8147d1638014ff9983f1fde2402041da28307211 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -25,8 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
@@ -122,7 +120,6 @@ vlc_module_begin();
     set_capability( "sub filter", 0 );
     set_callbacks( CreateFilter, DestroyFilter );
     set_description( _("Logo sub filter") );
-    add_shortcut( "logo" );
 vlc_module_end();
 
 static const char *ppsz_filter_options[] = {
@@ -779,13 +776,13 @@ static void DestroyFilter( vlc_object_t *p_this )
     free( p_sys );
 
     /* Delete the logo variables from INPUT */
-    var_Destroy( p_filter->p_libvlc_global , "logo-file" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-x" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-y" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-delay" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-repeat" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-position" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-transparency" );
+    var_Destroy( p_filter->p_libvlc, "logo-file" );
+    var_Destroy( p_filter->p_libvlc, "logo-x" );
+    var_Destroy( p_filter->p_libvlc, "logo-y" );
+    var_Destroy( p_filter->p_libvlc, "logo-delay" );
+    var_Destroy( p_filter->p_libvlc, "logo-repeat" );
+    var_Destroy( p_filter->p_libvlc, "logo-position" );
+    var_Destroy( p_filter->p_libvlc, "logo-transparency" );
 }
 
 /*****************************************************************************