s/vout_Destroy/vlc_object_release/ - A cat is a cat

[vlc] / modules / video_filter / puzzle.c

diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 42c12f365d7d1338fa79dbd123b3552567320002..c2bcfd76ea46a712a34f45731e0885659c490c28 100644 (file)
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <math.h>
@@ -71,8 +72,8 @@ static int PuzzleCallback( vlc_object_t *, char const *,
 #define CFG_PREFIX "puzzle-"
 
 vlc_module_begin();
-    set_description( _("Puzzle interactive game video filter") );
-    set_shortname( _( "Puzzle" ));
+    set_description( N_("Puzzle interactive game video filter") );
+    set_shortname( N_( "Puzzle" ));
     set_capability( "video filter", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -87,7 +88,7 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "rows", "cols", "black-slot", NULL
 };
 
@@ -333,7 +334,7 @@ static void Destroy( vlc_object_t *p_this )
     {
         DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
         vlc_object_detach( p_vout->p_sys->p_vout );
-        vout_Destroy( p_vout->p_sys->p_vout );
+        vlc_object_release( p_vout->p_sys->p_vout );
     }
 
     image_HandlerDelete( p_vout->p_sys->p_image );
@@ -398,8 +399,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
                 uint8_t color = ( i_plane == Y_PLANE ? 0x0 : 0x80 );
                 for( ; i_row < i_last_row; i_row++, i_orow++ )
                 {
-                    p_vout->p_libvlc->
-                    pf_memset( p_out->p_pixels + i_row * i_pitch
+                    vlc_memset( p_out->p_pixels + i_row * i_pitch
                                                + i_col * i_pitch / i_cols,
                                color, i_pitch / i_cols );
                 }
@@ -408,8 +408,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             {
                 for( ; i_row < i_last_row; i_row++, i_orow++ )
                 {
-                    p_vout->p_libvlc->
-                    pf_memcpy( p_out->p_pixels + i_row * i_pitch
+                    vlc_memcpy( p_out->p_pixels + i_row * i_pitch
                                                + i_col * i_pitch / i_cols,
                                p_in->p_pixels + i_orow * i_pitch
                                               + i_ocol * i_pitch / i_cols,
@@ -430,8 +429,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         int i_last_row = i_row + 1;
         i_row *= p_in->i_lines / i_rows;
         i_last_row *= p_in->i_lines / i_rows;
-        p_vout->p_libvlc->
-        pf_memset( p_out->p_pixels + i_row * i_pitch
+        vlc_memset( p_out->p_pixels + i_row * i_pitch
                                    + i_col * i_pitch / i_cols,
                    0xff, i_pitch / i_cols );
         for( ; i_row < i_last_row; i_row++ )
@@ -442,8 +440,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
                              + (i_col+1) * i_pitch / i_cols - 1 ] = 0xff;
         }
         i_row--;
-        p_vout->p_libvlc->
-        pf_memset( p_out->p_pixels + i_row * i_pitch
+        vlc_memset( p_out->p_pixels + i_row * i_pitch
                                    + i_col * i_pitch / i_cols,
                    0xff, i_pitch / i_cols );
     }