Skip to content

V
vlc
Commit fdbd6574 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix handling of authorization

parent 394754a5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/demux/live555.cpp
View file @ fdbd6574
...@@ -795,8 +795,7 @@ describe: ...@@ -795,8 +795,7 @@ describe:
authenticator.setUsernameAndPassword( (const char*)psz_user, authenticator.setUsernameAndPassword( (const char*)psz_user,
(const char*)psz_pwd ); (const char*)psz_pwd );
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url/*, psz_user, psz_pwd, psz_options = p_sys->rtsp->sendOptionsCmd( psz_url );
&authenticator*/ );
if( psz_options ) delete [] psz_options; if( psz_options ) delete [] psz_options;
p_sdp = p_sys->rtsp->describeURL( psz_url, p_sdp = p_sys->rtsp->describeURL( psz_url,
...@@ -805,14 +804,15 @@ describe: ...@@ -805,14 +804,15 @@ describe:
if( p_sdp == NULL ) if( p_sdp == NULL )
{ {
/* failure occurred */ /* failure occurred */
int i_code = 0; uint i_code = 0;
const char *psz_error = p_sys->env->getResultMsg(); const char *psz_error = p_sys->env->getResultMsg();
if( var_GetBool( p_demux, "rtsp-http" ) ) if( var_GetBool( p_demux, "rtsp-http" ) )
sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s",
&i_code ); &i_code );
else sscanf( psz_error, "%*sRTSP/%*u.%*u %3u %*s", &i_code ); else
msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); sscanf( psz_error, "%*s %*s %*s %*s RTSP/%*u.%*u %3u %*s", &i_code );
msg_Dbg( p_demux, "DESCRIBE failed with %d: [%s]", i_code, psz_error );
if( i_code == 401 ) if( i_code == 401 )
{ {
......
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