Skip to content

V
vlc-1.1
Commit ef4da627 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

live555: Fix fallback case for unsupported transport. 

This was broken by [175310ff] which introduced "forced mcast".
parent e54f5023
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
modules/demux/live555.cpp
View file @ ef4da627
...@@ -723,18 +723,15 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -723,18 +723,15 @@ static int SessionsSetup( demux_t *p_demux )
/* Issue the SETUP */ /* Issue the SETUP */
if( p_sys->rtsp ) if( p_sys->rtsp )
{ {
bool tcp = b_rtsp_tcp;
bool mcast = p_sys->b_force_mcast;
if( !p_sys->rtsp->setupMediaSubsession( *sub, False, if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
tcp ? True : False, b_rtsp_tcp ? True : False,
( mcast && !tcp ) ? True : False ) ) ( p_sys->b_force_mcast && !b_rtsp_tcp ) ? True : False ) )
{ {
tcp = !tcp;
/* if we get an unsupported transport error, toggle TCP use and try again */ /* if we get an unsupported transport error, toggle TCP use and try again */
if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport") if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport")
|| !p_sys->rtsp->setupMediaSubsession( *sub, False, || !p_sys->rtsp->setupMediaSubsession( *sub, False,
tcp ? False : True, !b_rtsp_tcp ? False : True,
( mcast && !tcp ) ? True : False ) ) False ) )
{ {
msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(), msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
sub->codecName(), p_sys->env->getResultMsg() ); sub->codecName(), p_sys->env->getResultMsg() );
......
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