[vlc-commits] rtp output: print warnings when setting the RTSP server address

[Pierre Ynard]

vlc/vlc-1.2 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun Dec 18 19:17:05 2011 +0100| [96e2c0ebbaab6e859e6675792eb36f5b93b6879b] | committer: Pierre Ynard

rtp output: print warnings when setting the RTSP server address
(cherry picked from commit 5072776786e9aa99d98921f4169125a9ed9e3a89)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

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

 modules/stream_out/rtp.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 95d350c..702148a 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -735,23 +735,23 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url )
 
         if( url.psz_host != NULL && *url.psz_host )
         {
-            /* msg_Err( p_stream, "\"%s\" RTSP host ignored", url.psz_host );
-            msg_Info( p_stream, "Pass --rtsp-host=%s on the command line "
-                      "instead.", url.psz_host ); */
+            msg_Warn( p_stream, "\"%s\" RTSP host might be ignored in "
+                      "multiple-host configurations, use at your own risks.",
+                      url.psz_host );
+            msg_Info( p_stream, "Consider passing --rtsp-host=IP on the "
+                                "command line instead." );
 
             var_Create( p_stream, "rtsp-host", VLC_VAR_STRING );
             var_SetString( p_stream, "rtsp-host", url.psz_host );
         }
-        /* if( url.i_port != 0 )
+        if( url.i_port != 0 )
         {
-            msg_Err( p_stream, "\"%u\" RTSP port ignored", url.i_port );
-            msg_Info( p_stream, "Pass --rtsp-port=%u on the command line "
-                      "instead.", url.i_port );
-        } */
-
-        if( url.i_port <= 0 ) url.i_port = 554;
-        var_Create( p_stream, "rtsp-port", VLC_VAR_INTEGER );
-        var_SetInteger( p_stream, "rtsp-port", url.i_port );
+            /* msg_Info( p_stream, "Consider passing --rtsp-port=%u on "
+                      "the command line instead.", url.i_port ); */
+
+            var_Create( p_stream, "rtsp-port", VLC_VAR_INTEGER );
+            var_SetInteger( p_stream, "rtsp-port", url.i_port );
+        }
 
         p_sys->rtsp = RtspSetup( VLC_OBJECT(p_stream), NULL, url.psz_path );
         if( p_sys->rtsp == NULL )