From ccb91d379a0f15c1833b2381066516d7aaa15c4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 13 Mar 2010 17:13:30 +0200 Subject: [PATCH] RTP output: fix SRTP error path --- modules/stream_out/rtp.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 20b758595f..ab3907b167 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -986,7 +986,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) #ifdef HAVE_SRTP 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"); if (key) { @@ -1011,16 +1022,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } #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 ) switch( p_sys->proto ) { -- 2.39.2