RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add bandwidth before failing if feed is already being received 

Originally committed as revision 17516 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-22 02:06:55 +00:00
parent 0047372722
commit d8f28a7727
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffserver.c
View File

@ -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 already streaming this feed, do not let start another feeder. */
if (stream->feed_opened) { if (stream->feed_opened) {
snprintf(msg, sizeof(msg), "This feed is already being received."); snprintf(msg, sizeof(msg), "This feed is already being received.");
@ -1362,9 +1365,6 @@ static int http_parse_request(HTTPContext *c)
goto send_error; 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) { if (c->post == 0 && max_bandwidth < current_bandwidth) {
c->http_error = 200; c->http_error = 200;
q = c->buffer; q = c->buffer;