[vlc-devel] commit: live555: Fix fallback case for unsupported transport. ( Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Mon Jul 21 14:33:03 2008 +0200| [ef4da6276172fae93c921630de10ca9ab4162487]

live555: Fix fallback case for unsupported transport.

This was broken by [175310ff6066991ee45e2a839f8c53e12b75e6d4] which introduced "forced mcast".

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

 modules/demux/live555.cpp |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index cd77304..6379181 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -723,18 +723,15 @@ static int SessionsSetup( demux_t *p_demux )
             /* Issue the SETUP */
             if( p_sys->rtsp )
             {
-                bool tcp = b_rtsp_tcp;
-                bool mcast = p_sys->b_force_mcast;
                 if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
-                                           tcp ? True : False,
-                                           ( mcast && !tcp ) ? True : False ) )
+                                           b_rtsp_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( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport")
                      || !p_sys->rtsp->setupMediaSubsession( *sub, False,
-                                           tcp ? False : True,
-                                           ( mcast && !tcp ) ? True : False ) )
+                                           !b_rtsp_tcp ? False : True,
+                                           False ) )
                     {
                         msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
                                  sub->codecName(), p_sys->env->getResultMsg() );