[vlc-commits] rtsp: fix timeout value and format string

Rémi Denis-Courmont git at videolan.org
Sun Jun 17 10:34:01 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jun 17 11:33:11 2018 +0300| [eb22c343191176a4bb3545aeec4a0ba6620c01c9] | committer: Rémi Denis-Courmont

rtsp: fix timeout value and format string

The protocol requires seconds.

Regression from 1c8acb0653180ab98c0e499111983a7333323580

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

 modules/stream_out/rtsp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 380da23699..2af657164d 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -69,7 +69,7 @@ struct rtsp_stream_t
     int             sessionc;
     rtsp_session_t **sessionv;
 
-    mtime_t         timeout;
+    unsigned        timeout;
     vlc_timer_t     timer;
 };
 
@@ -1195,7 +1195,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     if( psz_session )
     {
         if (rtsp->timeout > 0)
-            httpd_MsgAdd( answer, "Session", "%s;timeout=%d", psz_session,
+            httpd_MsgAdd( answer, "Session", "%s;timeout=%u", psz_session,
                                                               rtsp->timeout );
         else
             httpd_MsgAdd( answer, "Session", "%s", psz_session );



More information about the vlc-commits mailing list