[vlc-commits] sout_setid: parse the config string before any usage to var_Get.

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Jan 20 20:57:58 2011 +0100| [e0e66bfc7cdbe2c6d839e14cf541b4f7db8399c4] | committer: Rémi Duraffort

sout_setid: parse the config string before any usage to var_Get.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e0e66bfc7cdbe2c6d839e14cf541b4f7db8399c4
---

 modules/stream_out/setid.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c
index 5ed2f10..a2d8d4a 100644
--- a/modules/stream_out/setid.c
+++ b/modules/stream_out/setid.c
@@ -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;