From b8d017adba857715908ece3c28179549e40b48fa Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 7 Jul 2014 22:29:02 +0200 Subject: avformat/segment: simplify localtime* use Signed-off-by: Michael Niedermayer --- libavformat/segment.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libavformat/segment.c') diff --git a/libavformat/segment.c b/libavformat/segment.c index a09d49d4bf..f5e25a29d5 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -669,13 +669,6 @@ fail: return ret; } -#if !HAVE_LOCALTIME_R -static void localtime_r(const time_t *t, struct tm *tm) -{ - *tm = *localtime(t); -} -#endif - static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) { SegmentContext *seg = s->priv_data; @@ -697,7 +690,11 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) } else { if (seg->use_clocktime) { gettimeofday(&now, NULL); +#if HAVE_LOCALTIME_R localtime_r(&now.tv_sec, &ti); +#else + ti = *localtime(&now.tv_sec); +#endif usecs = (int64_t)(ti.tm_hour*3600 + ti.tm_min*60 + ti.tm_sec) * 1000000 + now.tv_usec; wrapped_val = usecs % seg->time; if (seg->last_cut != usecs && wrapped_val < seg->last_val) { -- cgit v1.2.3