From 907101eb8395564dd9485c7e97fb1b5ae6afb9ad Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Fri, 2 Jan 2015 22:30:05 -0300 Subject: [PATCH] ffserver: reflow compute_status() Signed-off-by: Reynaldo H. Verdejo Pinochet --- ffserver.c | 12 ++++++++---- 1 file 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, " - - - - \n"); break; } - } stream = stream->next; } avio_printf(pb, "\n"); stream = config.first_stream; while (stream) { - if (stream->feed == stream) { + if (stream->feed != stream) { + stream = stream->next; + continue; + } avio_printf(pb, "

Feed %s

", 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, "\n"); - } stream = stream->next; }