ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reyna...@osg.samsung.com> | Sun Jul 26 23:11:37 2015 -0300| [c75bc268a2894d26e793d0c12e84d4ec6cc24860] | committer: Reynaldo H. Verdejo Pinochet
ffserver: simplify assignment with ternary Signed-off-by: Reynaldo H. Verdejo Pinochet <reyna...@osg.samsung.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c75bc268a2894d26e793d0c12e84d4ec6cc24860 --- ffserver.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ffserver.c b/ffserver.c index 551ef88..b4e6093 100644 --- a/ffserver.c +++ b/ffserver.c @@ -703,13 +703,9 @@ static void start_wait_request(HTTPContext *c, int is_rtsp) c->buffer_ptr = c->buffer; c->buffer_end = c->buffer + c->buffer_size - 1; /* leave room for '\0' */ - if (is_rtsp) { - c->timeout = cur_time + RTSP_REQUEST_TIMEOUT; - c->state = RTSPSTATE_WAIT_REQUEST; - } else { - c->timeout = cur_time + HTTP_REQUEST_TIMEOUT; - c->state = HTTPSTATE_WAIT_REQUEST; - } + c->state = is_rtsp ? RTSPSTATE_WAIT_REQUEST : HTTPSTATE_WAIT_REQUEST; + c->timeout = cur_time + + 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