Move av_gettime() to libavutil

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard
2012-06-20 01:24:39 +01:00
parent db7d8fb4ef
commit ae0a301668
6 changed files with 70 additions and 9 deletions

View File

@@ -38,8 +38,6 @@
#include "riff.h"
#include "audiointerleave.h"
#include "url.h"
#include <sys/time.h>
#include <time.h>
#include <stdarg.h>
#if CONFIG_NETWORK
#include "network.h"
@@ -3411,12 +3409,12 @@ void av_dump_format(AVFormatContext *ic,
av_free(printed);
}
int64_t av_gettime(void)
#if FF_API_AV_GETTIME && CONFIG_SHARED && HAVE_SYMVER
FF_SYMVER(int64_t, av_gettime, (void), "LIBAVFORMAT_54")
{
struct timeval tv;
gettimeofday(&tv,NULL);
return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
return av_gettime();
}
#endif
uint64_t ff_ntp_time(void)
{