[vlc-commits] Use var_GetInteger when applicable.
Rémi Duraffort
git at videolan.org
Wed Feb 16 00:03:44 CET 2011
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Feb 15 23:52:56 2011 +0100| [ec37907e589dbe5656d288c58cab7b8455042caa] | committer: Rémi Duraffort
Use var_GetInteger when applicable.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec37907e589dbe5656d288c58cab7b8455042caa
---
modules/stream_out/rtp.c | 4 ++--
modules/stream_out/select.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index b49260d..4d1648a 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -992,7 +992,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
}
#ifdef HAVE_SRTP
- char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
+ char *key = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
if (key)
{
id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
@@ -1003,7 +1003,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
goto error;
}
- char *salt = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt");
+ char *salt = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt");
errno = srtp_setkeystring (id->srtp, key, salt ? salt : "");
free (salt);
free (key);
diff --git a/modules/stream_out/select.c b/modules/stream_out/select.c
index 93d8266..efea525 100644
--- a/modules/stream_out/select.c
+++ b/modules/stream_out/select.c
@@ -115,14 +115,14 @@ static int Open(vlc_object_t *p_this)
config_ChainParse(p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg);
- int port = var_CreateGetInteger(p_stream, SOUT_CFG_PREFIX "port");
+ int port = var_GetInteger(p_stream, SOUT_CFG_PREFIX "port");
p_sys->i_fd = net_ListenUDP1(VLC_OBJECT(p_stream), NULL, port);
if (p_sys->i_fd < 0)
{
free( p_sys );
return VLC_EGENERIC;
}
- p_sys->i_id_disable = var_CreateGetInteger(p_stream, SOUT_CFG_PREFIX "disable");
+ p_sys->i_id_disable = var_GetInteger(p_stream, SOUT_CFG_PREFIX "disable");
p_sys->pp_es = NULL;
p_sys->i_es_num = 0;
More information about the vlc-commits
mailing list