X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdemux%2Flive555.cpp;h=00b51715c46569702444d1047f3c81305e03fc79;hb=d1d56e18a807abb076a24428352c6a9ea60aea16;hp=1643f8b6b954b2f9b67d80bbc2a61e8052580aba;hpb=f1590d98ae55f55c1c5df515a5eabf68e1190d1e;p=vlc 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 */