[FFmpeg-cvslog] ffserver: explicitly use time_t for uptime calc
Reynaldo H. Verdejo Pinochet
git at videolan.org
Tue Dec 15 19:18:07 CET 2015
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Mon Dec 14 23:28:03 2015 -0800| [0bdf84b6b0527d30970c5fa555c7bc00a852a3cc] | committer: Reynaldo H. Verdejo Pinochet
ffserver: explicitly use time_t for uptime calc
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bdf84b6b0527d30970c5fa555c7bc00a852a3cc
---
ffserver.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index fcee874..129f9fd 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3807,7 +3807,8 @@ static void compute_bandwidth(void)
static void handle_child_exit(int sig)
{
pid_t pid;
- int status, uptime;
+ int status;
+ time_t uptime;
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
FFServerStream *feed;
@@ -3819,7 +3820,8 @@ static void handle_child_exit(int sig)
uptime = time(0) - feed->pid_start;
feed->pid = 0;
fprintf(stderr,
- "%s: Pid %"PRId64" exited with status %d after %d seconds\n",
+ "%s: Pid %"PRId64" exited with status %d after %"PRId64" "
+ "seconds\n",
feed->filename, (int64_t) pid, status, uptime);
if (uptime < 30)
More information about the ffmpeg-cvslog
mailing list