]> git.sesse.net Git - vlc/commitdiff
sout_setid: parse the config string before any usage to var_Get.
authorRémi Duraffort <ivoire@videolan.org>
Thu, 20 Jan 2011 19:57:58 +0000 (20:57 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Thu, 20 Jan 2011 20:01:02 +0000 (21:01 +0100)
modules/stream_out/setid.c

index 5ed2f10acc12d0310638da7fb9acfe718f1377d1..a2d8d4a8863af4e2096e48a333445d7438937904 100644 (file)
@@ -143,13 +143,13 @@ static int OpenId( vlc_object_t *p_this )
 
     sout_stream_t *p_stream = (sout_stream_t*)p_this;
 
+    config_ChainParse( p_stream, SOUT_CFG_PREFIX_ID, ppsz_sout_options_id,
+                       p_stream->p_cfg );
+
     p_stream->p_sys->i_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX_ID "id" );
     p_stream->p_sys->i_new_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX_ID "new-id" );
     p_stream->p_sys->psz_language = NULL;
 
-    config_ChainParse( p_stream, SOUT_CFG_PREFIX_ID, ppsz_sout_options_id,
-                       p_stream->p_cfg );
-
     p_stream->pf_add = AddId;
 
     return VLC_SUCCESS;
@@ -163,13 +163,13 @@ static int OpenLang( vlc_object_t *p_this )
 
     sout_stream_t *p_stream = (sout_stream_t*)p_this;
 
+    config_ChainParse( p_stream, SOUT_CFG_PREFIX_LANG, ppsz_sout_options_lang,
+                       p_stream->p_cfg );
+
     p_stream->p_sys->i_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX_LANG "id" );
     p_stream->p_sys->i_new_id = -1;
     p_stream->p_sys->psz_language = var_GetString( p_stream, SOUT_CFG_PREFIX_LANG "lang" );
 
-    config_ChainParse( p_stream, SOUT_CFG_PREFIX_LANG, ppsz_sout_options_lang,
-                       p_stream->p_cfg );
-
     p_stream->pf_add = AddLang;
 
     return VLC_SUCCESS;