* fix minor resize-bug when closing the playlist (closes #210)

[vlc] / modules / mux / mpjpeg.c

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 535763fc12e8b02bea1f3ed45a9e029eb3465a24..ae396e91623a689d0120b80285f58adfeec6c54f 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -31,7 +31,7 @@
 
 #define SEPARATOR_TEXT N_( "Multipart separator string" )
 #define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
-                               "separator string betwen content pieces. "\
+                               "separator string between content pieces. "\
                                "You can select this string. Default is "\
                                "--myboundary" )
 
@@ -46,7 +46,7 @@ static void Close  ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
 vlc_module_begin();
-    set_shortname( _("MPJPEG"));
+    set_shortname( "MPJPEG" );
     set_description( _("Multipart jpeg muxer") );
     set_capability( "sout mux", 5 );
     add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,
@@ -84,11 +84,12 @@ static int Open( vlc_object_t *p_this )
     char *psz_separator_block, *psz_separator;
 
     msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
+    sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
 
     p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );
     p_sys->b_send_headers = VLC_TRUE;
 
-    psz_separator = var_CreateGetString( p_mux, SOUT_CFG_PREFIX "separator" );
+    psz_separator = var_GetString( p_mux, SOUT_CFG_PREFIX "separator" );
     i_size = strlen( psz_separator ) + 2 + 2 + 2 + strlen( CONTENT_TYPE );
     psz_separator_block = (char*)malloc( i_size );
     sprintf( psz_separator_block, "\r\n%s\r\n%s\r\n", psz_separator,