X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fclone.c;h=3b558d3b1825731414f3fe57200a6bac419e8970;hb=6cc9595de6e94e5f56242a7b605fc30fa3369081;hp=2444af44dc6d7f1c71c3444d41958db435733987;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index 2444af44dc..3b558d3b18 100644
--- 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>
 
@@ -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;
@@ -331,7 +328,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 )
                ) == NULL )
         {
-            if( p_vout->b_die || p_vout->b_error )
+            if( !vlc_object_alive (p_vout) || p_vout->b_error )
             {
                 vout_DestroyPicture(
                     p_vout->p_sys->pp_vout[ i_vout ], p_outpic );
@@ -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] );
     }
 }