Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrade bandwidth to uint64_t

Browse Source 
Originally committed as revision 13841 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 17 years ago
parent 9507a12e42
commit 1ad8289ede
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ffserver.c

8
ffserver.c
Unescape View File

@ -295,8 +295,8 @@ static int need_to_start_children;
static int nb_max_connections; static int nb_max_connections;
static int nb_connections; static int nb_connections;
static int max_bandwidth; static uint64_t max_bandwidth;
static int current_bandwidth; static uint64_t current_bandwidth;
static int64_t cur_time; // Making this global saves on passing it around everywhere static int64_t cur_time; // Making this global saves on passing it around everywhere
@ -1315,7 +1315,7 @@ static int http_parse_request(HTTPContext *c)
q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n");
q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<html><head><title>Too busy</title></head><body>\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<html><head><title>Too busy</title></head><body>\r\n");
q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The server is too busy to serve your request at this time.</p>\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The server is too busy to serve your request at this time.</p>\r\n");
q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec.</p>\r\n", q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %lldkbit/sec, and this exceeds the limit of %lldkbit/sec.</p>\r\n",
current_bandwidth, max_bandwidth); current_bandwidth, max_bandwidth);
q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</body></html>\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</body></html>\r\n");
@ -1811,7 +1811,7 @@ static void compute_status(HTTPContext *c)
url_fprintf(pb, "Number of connections: %d / %d<BR>\n", url_fprintf(pb, "Number of connections: %d / %d<BR>\n",
nb_connections, nb_max_connections); nb_connections, nb_max_connections);
url_fprintf(pb, "Bandwidth in use: %dk / %dk<BR>\n", url_fprintf(pb, "Bandwidth in use: %lldk / %lldk<BR>\n",
current_bandwidth, max_bandwidth); current_bandwidth, max_bandwidth);
url_fprintf(pb, "<TABLE>\n"); url_fprintf(pb, "<TABLE>\n");

Write Preview
Loading…
Cancel
Save