Avoid potential segfault and fix potential memleak.

[vlc] / modules / video_output / snapshot.c

diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c
index c13a4ef928dd84e102237b65fa2dfe57fa9ea12f..fb0b9cf7ce124ac4c7a73e687e5502b619bc54c2 100644 (file)
--- a/modules/video_output/snapshot.c
+++ b/modules/video_output/snapshot.c
@@ -43,7 +43,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
@@ -76,17 +77,17 @@ static void Display   ( vout_thread_t *, picture_t * );
 
 
 vlc_module_begin( );
-    set_description( _( "Snapshot module" ) );
-    set_shortname( _("Snapshot") );
+    set_description( N_( "Snapshot module" ) );
+    set_shortname( N_("Snapshot") );
 
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     set_capability( "video output", 1 );
 
-    add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_FALSE );
-    add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE );
-    add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, VLC_TRUE );
-    add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, VLC_TRUE );
+    add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false );
+    add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
+    add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
+    add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true );
 
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -382,9 +383,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
 
     i_index = p_vout->p_sys->i_index;
 
-    p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_list[i_index]->p_data,
-                                 p_pic->p->p_pixels,
-                                  p_vout->p_sys->i_datasize );
+    vlc_memcpy( p_vout->p_sys->p_list[i_index]->p_data, p_pic->p->p_pixels,
+                p_vout->p_sys->i_datasize );
 
     i_date = snapshot_GetMovietime( p_vout );