Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / video_filter / clone.c

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index c6e81f605ba873528ec2d6e467fc131dec6d6a05..b6d48320544b72263db46a90890b117fbd47e93a 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 
@@ -66,9 +66,9 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define CFG_PREFIX "clone-"
 
 vlc_module_begin();
-    set_description( _("Clone video filter") );
+    set_description( N_("Clone video filter") );
     set_capability( "video filter", 0 );
-    set_shortname( _("Clone" ));
+    set_shortname( N_("Clone" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
@@ -79,7 +79,7 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "count", "vout-list", NULL
 };
 
@@ -127,10 +127,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_vout->pf_init = Init;
     p_vout->pf_end = End;
@@ -391,7 +388,7 @@ static void RemoveAllVout( vout_thread_t *p_vout )
          DEL_CALLBACKS( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones],
                         SendEvents );
          vlc_object_detach( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
-         vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
+         vlc_object_release( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
     }
 }