diff options
author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2015-01-02 22:30:05 -0300 |
---|---|---|
committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2015-01-03 20:22:45 -0300 |
commit | 907101eb8395564dd9485c7e97fb1b5ae6afb9ad (patch) | |
tree | 18760348b4608a5fa05995194f8e77116a103350 /ffserver.c | |
parent | 5c95de150f3b18f2e76fed670d6ea579feab1206 (diff) | |
download | ffmpeg-907101eb8395564dd9485c7e97fb1b5ae6afb9ad.tar.gz |
ffserver: reflow compute_status()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver.c')
-rw-r--r-- | ffserver.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 9472c41aab..93e546751c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1770,7 +1770,10 @@ static void compute_status(HTTPContext *c) char sfilename[1024]; char *eosf; - if (stream->feed != stream) { + if (stream->feed == stream) { + stream = stream->next; + continue; + } av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10); eosf = sfilename + strlen(sfilename); 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"); break; } - } stream = stream->next; } avio_printf(pb, "</table>\n"); stream = config.first_stream; while (stream) { - if (stream->feed == stream) { + if (stream->feed != stream) { + stream = stream->next; + continue; + } avio_printf(pb, "<h2>Feed %s</h2>", stream->filename); if (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"); - } stream = stream->next; } |