From 2dad0dcec6bcd826afe4e51ff2645bf1be74939c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 15 Mar 2010 10:36:30 +0000
Subject: [PATCH] Move the NTP offset definitions to internal.h
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/internal.h | 3 +++
libavformat/utils.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 0881fd22102..29b80c47e82 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 f6cbbb4a930..b952bcf05cb 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;
--
GitLab