[FFmpeg-cvslog] avformat/segment: use time_internal.h, simplify code

Michael Niedermayer git at videolan.org
Sun Nov 2 20:18:46 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov  2 20:07:34 2014 +0100| [32a2876b12f6e839292b0ee699ff7bd0f11ed4d4] | committer: Michael Niedermayer

avformat/segment: use time_internal.h, simplify code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32a2876b12f6e839292b0ee699ff7bd0f11ed4d4
---

 libavformat/segment.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 9db2607..4e0af7c 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -39,6 +39,7 @@
 #include "libavutil/parseutils.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/time.h"
+#include "libavutil/time_internal.h"
 #include "libavutil/timestamp.h"
 
 typedef struct SegmentListEntry {
@@ -716,11 +717,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
         if (seg->use_clocktime) {
             int64_t avgt = av_gettime();
             time_t sec = avgt / 1000000;
-#if HAVE_LOCALTIME_R
             localtime_r(&sec, &ti);
-#else
-            ti = *localtime(&sec);
-#endif
             usecs = (int64_t)(ti.tm_hour*3600 + ti.tm_min*60 + ti.tm_sec) * 1000000 + (avgt % 1000000);
             wrapped_val = usecs % seg->time;
             if (seg->last_cut != usecs && wrapped_val < seg->last_val) {



More information about the ffmpeg-cvslog mailing list