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

ffserver: fix up rate units in server messages

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
pull/118/merge
Reynaldo H. Verdejo Pinochet 9 years ago
parent d8c714cb24
commit 84b4998dbd
1 changed files with 5 additions and 5 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. 10
      ffserver.c

10
ffserver.c
Unescape View File

@ -1491,8 +1491,8 @@ static int http_parse_request(HTTPContext *c)
"<p>The server is too busy to serve your request at " "<p>The server is too busy to serve your request at "
"this time.</p>\r\n" "this time.</p>\r\n"
"<p>The bandwidth being served (including your stream) " "<p>The bandwidth being served (including your stream) "
"is %"PRIu64"kbit/sec, and this exceeds the limit of " "is %"PRIu64"kbit/s, and this exceeds the limit of "
"%"PRIu64"kbit/sec.</p>\r\n" "%"PRIu64"kbit/s.</p>\r\n"
"</body></html>\r\n", "</body></html>\r\n",
current_bandwidth, config.max_bandwidth); current_bandwidth, config.max_bandwidth);
q += strlen(q); q += strlen(q);
@ -1789,7 +1789,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream)
stream_no = stream->nb_streams; stream_no = stream->nb_streams;
avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>" avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>"
"type<th>kbits/s<th align=left>codec<th align=left>" "type<th>kbit/s<th align=left>codec<th align=left>"
"Parameters\n"); "Parameters\n");
for (i = 0; i < stream_no; i++) { for (i = 0; i < stream_no; i++) {
@ -1854,7 +1854,7 @@ static void compute_status(HTTPContext *c)
/* format status */ /* format status */
avio_printf(pb, "<h2>Available Streams</h2>\n"); avio_printf(pb, "<h2>Available Streams</h2>\n");
avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n"); avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n"); avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbit/s<th align=left>Video<br>kbit/s<th><br>Codec<th align=left>Audio<br>kbit/s<th><br>Codec<th align=left valign=top>Feed\n");
stream = config.first_stream; stream = config.first_stream;
while (stream) { while (stream) {
char sfilename[1024]; char sfilename[1024];
@ -2009,7 +2009,7 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "<table>\n"); avio_printf(pb, "<table>\n");
avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target " avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target "
"bits/sec<th>Actual bits/sec<th>Bytes transferred\n"); "bit/s<th>Actual bit/s<th>Bytes transferred\n");
c1 = first_http_ctx; c1 = first_http_ctx;
i = 0; i = 0;
while (c1) { while (c1) {

Write Preview
Loading…
Cancel
Save