[vlc-devel] commit: live555: unbreak windows RTSP servers ( introduced in c0d37c7c881712e182f03b52d0b00a911cab81ac). (Jean-Paul Saman )

git version control git at videolan.org
Mon Feb 2 23:37:28 CET 2009


vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Mon Feb  2 23:33:10 2009 +0100| [76f34d998b53665e31ec582d480373b8f4d03100] | committer: Jean-Paul Saman 

live555: unbreak windows RTSP servers (introduced in c0d37c7c881712e182f03b52d0b00a911cab81ac).

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

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

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 1643f8b..00b5171 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -564,19 +564,17 @@ describe:
 #endif
     }
     if( psz_options )
-    {
         p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ;
+    delete [] psz_options;
+
 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
-        p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
+    p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
                                           var_GetBool( p_demux, "rtsp-kasenna" ), timeout );
 #else
-        p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
+    p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
                                           var_GetBool( p_demux, "rtsp-kasenna" ) );
 #endif
 
-    }
-    delete [] psz_options;
-
     if( p_sdp == NULL )
     {
         /* failure occurred */




More information about the vlc-devel mailing list