Skip to content

V
vlc
Commit ccb91d37 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

RTP output: fix SRTP error path

parent 79ec7231
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 10 deletions
modules/stream_out/rtp.c
View file @ ccb91d37
...@@ -986,7 +986,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -986,7 +986,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
#ifdef HAVE_SRTP #ifdef HAVE_SRTP
id->srtp = NULL; id->srtp = NULL;
#endif
vlc_mutex_init( &id->lock_sink );
id->sinkc = 0;
id->sinkv = NULL;
id->rtsp_id = NULL;
id->p_fifo = NULL;
id->listen.fd = NULL;
id->i_caching =
(int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
#ifdef HAVE_SRTP
char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key"); char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
if (key) if (key)
{ {
...@@ -1011,16 +1022,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -1011,16 +1022,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
} }
#endif #endif
vlc_mutex_init( &id->lock_sink );
id->sinkc = 0;
id->sinkv = NULL;
id->rtsp_id = NULL;
id->p_fifo = NULL;
id->listen.fd = NULL;
id->i_caching =
(int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
if( p_sys->psz_destination != NULL ) if( p_sys->psz_destination != NULL )
switch( p_sys->proto ) switch( p_sys->proto )
{ {
......
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