[FFmpeg-cvslog] r22542 - in trunk/libavformat: internal.h utils.c

[mstorsjo]

Author: mstorsjo
Date: Mon Mar 15 11:36:30 2010
New Revision: 22542

Log:
Move the NTP offset definitions to internal.h

Modified:
   trunk/libavformat/internal.h
   trunk/libavformat/utils.c

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Mon Mar 15 11:30:38 2010	(r22541)
+++ trunk/libavformat/internal.h	Mon Mar 15 11:36:30 2010	(r22542)
@@ -37,6 +37,9 @@ void ff_interleave_add_packet(AVFormatCo
 
 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);
 

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Mon Mar 15 11:30:38 2010	(r22541)
+++ trunk/libavformat/utils.c	Mon Mar 15 11:36:30 2010	(r22542)
@@ -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;