From: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date: Thu, 17 Apr 2008 12:35:12 +0000 (+0200)
Subject: Fix RTSP client receiving on standard RTSP port 554.
X-Git-Tag: 0.9.0-test0~1434
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4dbeeda8ade44481672b264d4f1c89444cbf8efb;p=vlc

Fix RTSP client receiving on standard RTSP port 554.
---

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 1842f56708..e2f1a69696 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -470,10 +470,11 @@ static int Connect( demux_t *p_demux )
     psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 );
     if( !psz_url ) return VLC_ENOMEM;
 
+    if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554;
     if( p_sys->url.psz_username || p_sys->url.psz_password )
     {
-        sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host,
-                 p_sys->url.psz_path );
+        sprintf( psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host,
+                 p_sys->url.i_port, p_sys->url.psz_path );
 
         psz_user = strdup( p_sys->url.psz_username );
         psz_pwd  = strdup( p_sys->url.psz_password );