vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Jan 15 12:41:58 2018 +0100| [696f8780aa17b590fa879ab53c9cedf21d5343e5] | committer: Francois Cartegnie
access: rtsp: set port range before session init (fix #19485) otherwise gets ignored (cherry picked from commit 573d7fd6b5d894408454144aaae72f9c44df50d8) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=696f8780aa17b590fa879ab53c9cedf21d5343e5 --- modules/access/live555.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index 741fda6e35..e7e42bc6f4 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -781,6 +781,12 @@ static int SessionsSetup( demux_t *p_demux ) continue; } + if( p_sys->rtsp && i_client_port != -1 ) + { + sub->setClientPortNum( i_client_port ); + i_client_port += 2; + } + if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) bInit = sub->initiate( 0 ); else @@ -811,13 +817,6 @@ static int SessionsSetup( demux_t *p_demux ) /* Issue the SETUP */ 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, toBool( b_rtsp_tcp ), toBool( p_sys->b_force_mcast && !b_rtsp_tcp ) ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
