Fix network panel (start with deactivated checkboxes)

[vlc] / modules / video_filter / opencv_wrapper.c

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index db6b4a527fc99cbbc90e4714d28c474a8e397644..24f1be84067548b44874bc431189aa9587c85b3b 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -191,10 +191,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;
-    }
 
     /* Init structure */
     p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
@@ -558,7 +555,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
               == NULL )
     {
-        if( p_vout->b_die || p_vout->b_error )
+        if( !vlc_object_alive (p_vout) || p_vout->b_error )
         {   return; }
         msleep( VOUT_OUTMEM_SLEEP );
     }