aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-27 11:40:00 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-27 11:40:00 +0200
commitc719b7a42b3e5218304cc18858fde8c690ef4ecd (patch)
tree267c7f40c5220aee2089df4eacd9730de41f6fb3
parentb16b8c815c2c94ac2bbe0ee1a1775f76963339ea (diff)
downloadffmpeg-c719b7a42b3e5218304cc18858fde8c690ef4ecd.tar.gz
ffserver: add (), fix order of operations
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 42025ab475..c74cd157aa 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)