Fixed typo into invmem error message

[vlc] / modules / codec / invmem.c

diff --git a/modules/codec/invmem.c b/modules/codec/invmem.c
index 2990644f16584d2b5b0a6157e52bb36f124f5167..85c37234399d8f111ac179695f3c6b544f2b111f 100644 (file)
--- a/modules/codec/invmem.c
+++ b/modules/codec/invmem.c
@@ -83,8 +83,8 @@ vlc_module_begin()
     set_callbacks( OpenDecoder, CloseDecoder )
     add_shortcut( "invmem" )
 
-    add_integer( "invmem-width", "0", NULL, T_WIDTH, LT_WIDTH, false )
-    add_integer( "invmem-height", "0", NULL, T_HEIGHT, LT_HEIGHT, false )
+    add_integer( "invmem-width", 0, NULL, T_WIDTH, LT_WIDTH, false )
+    add_integer( "invmem-height", 0, NULL, T_HEIGHT, LT_HEIGHT, false )
     add_string( "invmem-lock", "0", NULL, T_LOCK, LT_LOCK, true )
     add_string( "invmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true )
     add_string( "invmem-data", "0", NULL, T_DATA, LT_DATA, true )
@@ -120,15 +120,16 @@ static int OpenDecoder( vlc_object_t *p_this )
     }
 
     /* Allocate the memory needed to store the decoder's structure */
-    if( ( p_dec->p_sys = p_sys =
-          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
+    if( ( p_dec->p_sys = p_sys = malloc(sizeof(decoder_sys_t)) ) == NULL )
         return VLC_ENOMEM;
 
     // get parametrs
     p_sys->i_width = var_CreateGetInteger( p_this, "invmem-width" );
     p_sys->i_height = var_CreateGetInteger( p_this, "invmem-height" );
-    if (p_sys->i_width == 0 || p_sys->i_height == 0) {
-        msg_Err( p_dec, "--vmem-width and --vmem-height must be > 0" );
+    if( p_sys->i_width == 0 || p_sys->i_height == 0 )
+    {
+        msg_Err( p_dec, "--invmem-width and --invmem-height must be > 0" );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -147,6 +148,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     if( !p_sys->pf_lock || !p_sys->pf_unlock )
     {
         msg_Err( p_dec, "Invalid lock or unlock callbacks" );
+        free( p_sys );
         return VLC_EGENERIC;
     }