From d8f28a77270b2d94fea92d56c8737eb626adce8d Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 22 Feb 2009 02:06:55 +0000 Subject: [PATCH] add bandwidth before failing if feed is already being received Originally committed as revision 17516 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffserver.c b/ffserver.c index 0c293e6065..4e746cb1af 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1355,6 +1355,9 @@ static int http_parse_request(HTTPContext *c) } } + if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) + current_bandwidth += stream->bandwidth; + /* If already streaming this feed, do not let start another feeder. */ if (stream->feed_opened) { snprintf(msg, sizeof(msg), "This feed is already being received."); @@ -1362,9 +1365,6 @@ static int http_parse_request(HTTPContext *c) goto send_error; } - if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) - current_bandwidth += stream->bandwidth; - if (c->post == 0 && max_bandwidth < current_bandwidth) { c->http_error = 200; q = c->buffer;