Commit ec37907e authored by Rémi Duraffort's avatar Rémi Duraffort

Use var_GetInteger when applicable.

parent 5010066b
...@@ -992,7 +992,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -992,7 +992,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
} }
#ifdef HAVE_SRTP #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) if (key)
{ {
id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10, 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 ) ...@@ -1003,7 +1003,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
goto error; 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 : ""); errno = srtp_setkeystring (id->srtp, key, salt ? salt : "");
free (salt); free (salt);
free (key); free (key);
......
...@@ -115,14 +115,14 @@ static int Open(vlc_object_t *p_this) ...@@ -115,14 +115,14 @@ static int Open(vlc_object_t *p_this)
config_ChainParse(p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, config_ChainParse(p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg); 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); p_sys->i_fd = net_ListenUDP1(VLC_OBJECT(p_stream), NULL, port);
if (p_sys->i_fd < 0) if (p_sys->i_fd < 0)
{ {
free( p_sys ); free( p_sys );
return VLC_EGENERIC; 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->pp_es = NULL;
p_sys->i_es_num = 0; p_sys->i_es_num = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment