[vlc-commits] Only use --rtsp-client-port when sending RTSP SETUP request

[David R Robison]

vlc | branch: master | David R Robison <david.robison at openroadsconsulting.com> | Mon Jul  6 13:51:55 2015 -0400| [97595a153b9bfb10a834cd67d4d88eccc2b7eb67] | committer: Jean-Baptiste Kempf

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

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=97595a153b9bfb10a834cd67d4d88eccc2b7eb67
---

 modules/access/live555.cpp |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index defbad3..41d2641 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -746,12 +746,6 @@ static int SessionsSetup( demux_t *p_demux )
             ;
         else continue;
 
-        if( i_client_port != -1 )
-        {
-            sub->setClientPortNum( i_client_port );
-            i_client_port += 2;
-        }
-
         if( strcasestr( sub->codecName(), "REAL" ) )
         {
             msg_Info( p_demux, "real codec detected, using real-RTSP instead" );
@@ -789,6 +783,13 @@ 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 ) );