[vlc-commits] live555 : only check for the error code in the result message string.

Sébastien Escudier git at videolan.org
Fri Mar 4 10:48:01 CET 2011


vlc/vlc-1.1 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Fri Mar  4 10:46:25 2011 +0100| [d553df56631fa9f99a1de0757d0943327ea18daa] | committer: Sébastien Escudier

live555 : only check for the error code in the result message string.

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

 modules/demux/live555.cpp |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 2f57d9e..1e552ab 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -586,9 +586,8 @@ describe:
                     &i_code );
         else
         {
-            const char *psz_tmp = strstr( psz_error, "RTSP" );
-            if( psz_tmp )
-                sscanf( psz_tmp, "RTSP/%*s%3u", &i_code );
+            if( strstr( psz_error, "401" ) )
+                i_code = 401;
             else
                 i_code = 0;
         }
@@ -739,8 +738,7 @@ static int SessionsSetup( demux_t *p_demux )
                 {
                     /* 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")
                         || !p_sys->rtsp->setupMediaSubsession( *sub, False,
                                                !toBool( b_rtsp_tcp ), False ) )
                     {



More information about the vlc-commits mailing list