Fix SDP line ordering (closes #716)

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index ac1ae92ef0c0324dcc9a66d89d0446f5c0698415..1ff60f56d51d37ca793da32009d50fd9c5794e98 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -1283,10 +1283,10 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
     if( *p_media->psz_session_email )
         p += sprintf( p, "e=%s\r\n", p_media->psz_session_email );
 
-    p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
+    p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
     p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
+    p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
 
-    p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
 
     if( p_media->i_length > 0 )
     {

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 0222eb2fd54c913206ee2221fbbd31d44da69013..579ddb3da081dca235ba6df1f87c31bb24cf2918 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -524,14 +524,12 @@ static int Open( vlc_object_t *p_this )
         }
 
         /* create the SDP for a muxed stream (only once) */
-        /* FIXME  http://www.faqs.org/rfcs/rfc2327.html
+        /* FIXME  http://www.faqs.org/rfcs/rfc4566.html
            All text fields should be UTF-8 encoded. Use global a:charset to announce this.
            o= - should be local username (no spaces allowed)
-           o= time should be hashed with some other value to garantue uniqueness
-           o= we need IP6 support?
+           o= time should be hashed with some other value to garantee uniqueness
            o= don't use the localhost address. use fully qualified domain name or IP4 address
            p= international phone number (pass via vars?)
-           c= IP6 support
            a= recvonly (missing)
            a= type:broadcast (missing)
            a= charset: (normally charset should be UTF-8, this can be used to override s= and i=)
@@ -555,9 +553,9 @@ static int Open( vlc_object_t *p_this )
                   "i=%s\r\n"
                   "u=%s\r\n"
                   "e=%s\r\n"
-                  "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
-                  "a=tool:"PACKAGE_STRING"\r\n"
                   "c=IN IP%c %s%s\r\n"
+                  "a=tool:"PACKAGE_STRING"\r\n"
+                  "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
                   "m=video %d RTP/AVP %d\r\n"
                   "a=rtpmap:%d %s\r\n",
                   p_sys->i_sdp_id, p_sys->i_sdp_version,