[FFmpeg-cvslog] ffserver: reflow compute_status()
Reynaldo H. Verdejo Pinochet
git at videolan.org
Sun Jan 4 00:27:31 CET 2015
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Fri Jan 2 22:30:05 2015 -0300| [907101eb8395564dd9485c7e97fb1b5ae6afb9ad] | committer: Reynaldo H. Verdejo Pinochet
ffserver: reflow compute_status()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=907101eb8395564dd9485c7e97fb1b5ae6afb9ad
---
ffserver.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 9472c41..93e5467 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;
}
More information about the ffmpeg-cvslog
mailing list