Browse Source

Move the NTP offset definitions to internal.h

Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Martin Storsjö 15 years ago
parent
commit
2dad0dcec6
2 changed files with 3 additions and 3 deletions
  1. +3
    -0
      libavformat/internal.h
  2. +0
    -3
      libavformat/utils.c

+ 3
- 0
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);



+ 0
- 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;


Loading…
Cancel
Save