Removed unused variable (logo).

[vlc] / modules / video_filter / canvas.c

diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index e301c5497783d6600cb30703cf3a301b4c1b64b7..f4ffe74d21e80956d4fdd545646727d31a664a92 100644 (file)
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -34,7 +34,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_vout.h>
 
 /*****************************************************************************
  * Local and extern prototypes.
@@ -63,22 +62,25 @@ static int alloc_init( filter_t *, void * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( N_("Automatically resize and padd a video") );
-    set_capability( "video filter2", 0 );
-    set_callbacks( Activate, Destroy );
+vlc_module_begin ()
+    set_description( N_("Automatically resize and padd a video") )
+    set_capability( "video filter2", 0 )
+    set_callbacks( Activate, Destroy )
+
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 )
 
     add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL,
-                            WIDTH_TEXT, WIDTH_LONGTEXT, false );
+                            WIDTH_TEXT, WIDTH_LONGTEXT, false )
     add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL,
-                            HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
+                            HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
 
     add_string( CFG_PREFIX "aspect", "4:3", NULL,
-                ASPECT_TEXT, ASPECT_LONGTEXT, false );
+                ASPECT_TEXT, ASPECT_LONGTEXT, false )
 
     add_bool( CFG_PREFIX "padd", true, NULL,
-              PADD_TEXT, PADD_LONGTEXT, false );
-vlc_module_end();
+              PADD_TEXT, PADD_LONGTEXT, false )
+vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {
     "width", "height", "aspect", "padd", NULL
@@ -286,13 +288,12 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
  *****************************************************************************/
 static picture_t *video_new( filter_t *p_filter )
 {
-    return ((filter_t*)p_filter->p_owner)->pf_vout_buffer_new( (filter_t*)p_filter->p_owner );
+    return filter_NewPicture( (filter_t*)p_filter->p_owner );
 }
 
 static void video_del( filter_t *p_filter, picture_t *p_pic )
 {
-    if( ((filter_t*)p_filter->p_owner)->pf_vout_buffer_del )
-        ((filter_t*)p_filter->p_owner)->pf_vout_buffer_del( (filter_t*)p_filter->p_owner, p_pic );
+    return filter_DeletePicture( (filter_t*)p_filter->p_owner, p_pic );
 }
 
 static int alloc_init( filter_t *p_filter, void *p_data )