virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Move the NTP offset definitions to internal.h

Browse Source 
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-15 10:36:30 +00:00
parent a5b3d34b5b
commit 2dad0dcec6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/internal.h
View File

@ -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);

3
libavformat/utils.c
View File

@ -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;