avformat/segment: simplify localtime* use
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 20:29:02 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 20:57:36 +0000 (22:57 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segment.c

index a09d49d..f5e25a2 100644 (file)
@@ -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) {