# HG changeset patch # User mstorsjo # Date 1268649390 0 # Node ID ba41d38652532157e553dd6519555781bf8c07d4 # Parent 2dd1e67a5892f1b7d31e0a3f1329b32b4091a3df Move the NTP offset definitions to internal.h diff -r 2dd1e67a5892 -r ba41d3865253 internal.h --- a/internal.h Mon Mar 15 10:29:37 2010 +0000 +++ b/internal.h Mon Mar 15 10:36:30 2010 +0000 @@ -37,6 +37,9 @@ void av_read_frame_flush(AVFormatContext *s); +#define NTP_OFFSET 2208988800ULL +#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL) + /** Gets the current time since NTP epoch in microseconds. */ uint64_t ff_ntp_time(void); diff -r 2dd1e67a5892 -r ba41d3865253 utils.c --- a/utils.c Mon Mar 15 10:29:37 2010 +0000 +++ b/utils.c Mon Mar 15 10:36:30 2010 +0000 @@ -3108,9 +3108,6 @@ return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; } -#define NTP_OFFSET 2208988800ULL -#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL) - uint64_t ff_ntp_time(void) { return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;