Mercurial > libavformat.hg
changeset 5841:ba41d3865253 libavformat
Move the NTP offset definitions to internal.h
| author | mstorsjo |
|---|---|
| date | Mon, 15 Mar 2010 10:36:30 +0000 |
| parents | 2dd1e67a5892 |
| children | cc35562d3747 |
| files | internal.h utils.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;