From: Jean-Paul Saman Date: Mon, 2 Feb 2009 22:33:10 +0000 (+0100) Subject: live555: unbreak windows RTSP servers (introduced in c0d37c7c881712e182f03b52d0b00a91... X-Git-Tag: 1.0.0-pre1~892 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=76f34d998b53665e31ec582d480373b8f4d03100;p=vlc live555: unbreak windows RTSP servers (introduced in c0d37c7c881712e182f03b52d0b00a911cab81ac). --- diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 1643f8b6b9..00b51715c4 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -564,19 +564,17 @@ describe: #endif } if( psz_options ) - { p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ; + delete [] psz_options; + #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600 - p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd, + p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd, var_GetBool( p_demux, "rtsp-kasenna" ), timeout ); #else - p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd, + p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd, var_GetBool( p_demux, "rtsp-kasenna" ) ); #endif - } - delete [] psz_options; - if( p_sdp == NULL ) { /* failure occurred */