diff options
| author | Martin Storsjö <martin@martin.st> | 2010-03-15 10:36:30 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-03-15 10:36:30 +0000 |
| commit | 2dad0dcec6bcd826afe4e51ff2645bf1be74939c (patch) | |
| tree | cddae82360a78afdf3e7a0fa9ca9d997ca9d0403 /libavformat | |
| parent | a5b3d34b5b0245f8cd714f016037d1bbcabf80a1 (diff) | |
Move the NTP offset definitions to internal.h
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/internal.h | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 0881fd2210..29b80c47e8 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -37,6 +37,9 @@ void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, 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 --git a/libavformat/utils.c b/libavformat/utils.c index f6cbbb4a93..b952bcf05c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3108,9 +3108,6 @@ int64_t av_gettime(void) 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; |