virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

ffserver: reflow compute_status()

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-01-02 22:30:05 -03:00
parent 5c95de150f
commit 907101eb83
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffserver.c
View File

@ -1770,7 +1770,10 @@ static void compute_status(HTTPContext *c)
char sfilename[1024]; char sfilename[1024];
char *eosf; char *eosf;
if (stream->feed != stream) { if (stream->feed == stream) {
stream = stream->next;
continue;
}
av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10); av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10);
eosf = sfilename + strlen(sfilename); eosf = sfilename + strlen(sfilename);
if (eosf - sfilename >= 4) { if (eosf - sfilename >= 4) {
@ -1849,14 +1852,16 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n"); avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n");
break; break;
} }
}
stream = stream->next; stream = stream->next;
} }
avio_printf(pb, "</table>\n"); avio_printf(pb, "</table>\n");
stream = config.first_stream; stream = config.first_stream;
while (stream) { while (stream) {
if (stream->feed == stream) { if (stream->feed != stream) {
stream = stream->next;
continue;
}
avio_printf(pb, "<h2>Feed %s</h2>", stream->filename); avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
if (stream->pid) { if (stream->pid) {
avio_printf(pb, "Running as pid %d.\n", stream->pid); avio_printf(pb, "Running as pid %d.\n", stream->pid);
@ -1916,7 +1921,6 @@ static void compute_status(HTTPContext *c)
} }
avio_printf(pb, "</table>\n"); avio_printf(pb, "</table>\n");
}
stream = stream->next; stream = stream->next;
} }