From 8cba6ba97aca9bea6fd3360982bf090c5c9dc539 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 21 Feb 2007 14:06:03 +0000 Subject: [PATCH] remove gettime_ms and use av_gettime instead of it Originally committed as revision 8052 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ffserver.c b/ffserver.c index 77471f3..0137413 100644 --- a/ffserver.c +++ b/ffserver.c @@ -294,14 +294,6 @@ static long cur_time; // Making this global saves on passing it around static AVRandomState random_state; -static long gettime_ms(void) -{ - struct timeval tv; - - gettimeofday(&tv,NULL); - return (long long)tv.tv_sec * 1000 + (tv.tv_usec / 1000); -} - static FILE *logfile = NULL; static void __attribute__ ((format (printf, 1, 2))) http_log(const char *fmt, ...) @@ -605,7 +597,7 @@ static int http_server(void) return -1; } while (ret <= 0); - cur_time = gettime_ms(); + cur_time = (long)(av_gettime()/1000); if (need_to_start_children) { need_to_start_children = 0; @@ -4528,7 +4520,7 @@ int main(int argc, char **argv) putenv("http_proxy"); /* Kill the http_proxy */ - av_init_random(gettime_ms() + (getpid() << 16), &random_state); + av_init_random(av_gettime() + (getpid() << 16), &random_state); /* address on which the server will handle HTTP connections */ my_http_addr.sin_family = AF_INET; -- 2.7.4