diff options
| author | James Almer <jamrial@gmail.com> | 2020-01-16 16:25:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-01-16 22:27:35 -0300 |
| commit | ab9627223e630390a8a99c052de2fb82abde2746 (patch) | |
| tree | c1b19bb0847a29d4545a6c73f54d5dc36956aeef /libavformat/utils.c | |
| parent | 80c3a15a1b620bc0cb5e8f5269bb3a0f514c339e (diff) | |
Revert "avformat/utils: make ff_ntp_time() accept a timestamp as input argument"
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 674757a63f..f3d71642c3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4684,9 +4684,9 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) } } -uint64_t ff_ntp_time(int64_t timestamp) +uint64_t ff_ntp_time(void) { - return (timestamp / 1000) * 1000 + NTP_OFFSET_US; + return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US; } uint64_t ff_get_formatted_ntp_time(uint64_t ntp_time_us) |