Win32: fix NULL-deref in non embedded video mode (fixes #2426)

[vlc] / modules / video_filter / opencv_wrapper.c

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 1647deb8e1153ec6a63b76143c59fabcae5c6e49..787240b3996d38e7d4494ef77adcc1bcbb158a0d 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -78,18 +78,18 @@ static const char *const verbosity_list[] = { "error", "warning", "debug"};
 static const char *const verbosity_list_text[] = { N_("Show only errors"),
   N_("Show errors and warnings"), N_("Show everything including debug messages")};
 
-vlc_module_begin();
-    set_description( N_("OpenCV video filter wrapper") );
-    set_shortname( N_("OpenCV" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter", 0 );
-    add_shortcut( "opencv_wrapper" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    set_description( N_("OpenCV video filter wrapper") )
+    set_shortname( N_("OpenCV" ))
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter", 0 )
+    add_shortcut( "opencv_wrapper" )
+    set_callbacks( Create, Destroy )
     add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL,
                           N_("Scale factor (0.1-2.0)"),
                           N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),
-                          false );
+                          false )
     add_string( "opencv-chroma", "input", NULL,
                           N_("OpenCV filter chroma"),
                           N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false);
@@ -105,7 +105,7 @@ vlc_module_begin();
     add_string( "opencv-filter-name", "none", NULL,
                           N_("OpenCV internal filter name"),
                           N_("Name of internal OpenCV plugin filter to use"), false);
-vlc_module_end();
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -334,7 +334,7 @@ static int Init( vout_thread_t *p_vout )
 
     if (p_vout->p_sys->psz_inner_name)
         p_sys->p_opencv->p_module =
-            module_Need( p_sys->p_opencv, p_sys->psz_inner_name, 0, 0 );
+            module_need( p_sys->p_opencv, p_sys->psz_inner_name, NULL, false );
 
     if( !p_sys->p_opencv->p_module )
     {
@@ -389,7 +389,7 @@ static void End( vout_thread_t *p_vout )
     {
         //release the internal opencv filter
         if( p_vout->p_sys->p_opencv->p_module )
-            module_Unneed( p_vout->p_sys->p_opencv, p_vout->p_sys->p_opencv->p_module );
+            module_unneed( p_vout->p_sys->p_opencv, p_vout->p_sys->p_opencv->p_module );
         vlc_object_detach( p_vout->p_sys->p_opencv );
         vlc_object_release( p_vout->p_sys->p_opencv );
         p_vout->p_sys->p_opencv = NULL;
@@ -589,7 +589,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         msg_Dbg( p_vout, "Render took %2.4f seconds\n", duration );
 
     ReleaseImages(p_vout);
-    vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
+    p_outpic->date  = p_pic->date;
     
     vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
     vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );