ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Mon Jul 27 11:40:00 2015 +0200| [c719b7a42b3e5218304cc18858fde8c690ef4ecd] | committer: Michael Niedermayer
ffserver: add (), fix order of operations Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c719b7a42b3e5218304cc18858fde8c690ef4ecd --- ffserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffserver.c b/ffserver.c index 42025ab..c74cd15 100644 --- a/ffserver.c +++ b/ffserver.c @@ -705,7 +705,7 @@ static void start_wait_request(HTTPContext *c, int is_rtsp) c->state = is_rtsp ? RTSPSTATE_WAIT_REQUEST : HTTPSTATE_WAIT_REQUEST; c->timeout = cur_time + - is_rtsp ? RTSP_REQUEST_TIMEOUT : HTTP_REQUEST_TIMEOUT; + (is_rtsp ? RTSP_REQUEST_TIMEOUT : HTTP_REQUEST_TIMEOUT); } static void http_send_too_busy_reply(int fd) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog