Use ephemeral default ports for RTP, instead of clashing with raw UDP.

Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

diff --git a/NEWS b/NEWS
index f26560a4cfccc5a0ad6b5a1515edc38435ce55be..eebd36bf370873f031290652993ae31372bc4891 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,8 +30,8 @@ Important notes:
     These new commands are also available in the telnet interface.
  * The "rtp" access output module has been removed:
    Please use the RTP stream output instead, e.g.:
-     Old: '#std{access=rtp,dst=239.255.1.2,sap}'
-     New: '#rtp{dst=239.255.1.2,sap}'
+     Old: '#std{access=rtp,mux=ts,dst=239.255.1.2:5004,sap}'
+     New: '#rtp{mux=ts,dst=239.255.1.2,port=5004,sap}'
  * You now need to append --m3u-extvlcopt to your command line to enable
    EXTVLCOPT options parsing in m3u playlists. Note that only a limited set
    of options is available to m3u playlists (CVE-2007-6683).

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 712db8fcb0e0d1c6ad2d91df135dfd4c760925b4..39c07ee2f01d140d269b393f0924e634fe78653c 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -173,11 +173,11 @@ vlc_module_begin();
     add_string( SOUT_CFG_PREFIX "proto", "udp", NULL, PROTO_TEXT,
                 PROTO_LONGTEXT, VLC_FALSE );
         change_string_list( ppsz_protos, ppsz_protocols, NULL );
-    add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT,
+    add_integer( SOUT_CFG_PREFIX "port", 50004, NULL, PORT_TEXT,
                  PORT_LONGTEXT, VLC_TRUE );
-    add_integer( SOUT_CFG_PREFIX "port-audio", 1230, NULL, PORT_AUDIO_TEXT,
+    add_integer( SOUT_CFG_PREFIX "port-audio", 50000, NULL, PORT_AUDIO_TEXT,
                  PORT_AUDIO_LONGTEXT, VLC_TRUE );
-    add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT,
+    add_integer( SOUT_CFG_PREFIX "port-video", 50002, NULL, PORT_VIDEO_TEXT,
                  PORT_VIDEO_LONGTEXT, VLC_TRUE );
 
     add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,