Skip to content

V
vlc
Commit 97595a15 authored by David R Robison's avatar David R Robison Committed by Jean-Baptiste Kempf
Browse files
Options

Only use --rtsp-client-port when sending RTSP SETUP request 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent e710a62c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
modules/access/live555.cpp
View file @ 97595a15
...@@ -746,12 +746,6 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -746,12 +746,6 @@ static int SessionsSetup( demux_t *p_demux )
; ;
else continue; else continue;
if( i_client_port != -1 )
{
sub->setClientPortNum( i_client_port );
i_client_port += 2;
}
if( strcasestr( sub->codecName(), "REAL" ) ) if( strcasestr( sub->codecName(), "REAL" ) )
{ {
msg_Info( p_demux, "real codec detected, using real-RTSP instead" ); msg_Info( p_demux, "real codec detected, using real-RTSP instead" );
...@@ -789,6 +783,13 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -789,6 +783,13 @@ static int SessionsSetup( demux_t *p_demux )
/* Issue the SETUP */ /* Issue the SETUP */
if( p_sys->rtsp ) if( p_sys->rtsp )
{ {
if( i_client_port != -1 )
{
sub->setClientPortNum( i_client_port );
i_client_port += 2;
}
p_sys->rtsp->sendSetupCommand( *sub, default_live555_callback, False, p_sys->rtsp->sendSetupCommand( *sub, default_live555_callback, False,
toBool( b_rtsp_tcp ), toBool( b_rtsp_tcp ),
toBool( p_sys->b_force_mcast && !b_rtsp_tcp ) ); toBool( p_sys->b_force_mcast && !b_rtsp_tcp ) );
......
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