Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / sbgdec.c

diff --git a/ffmpeg/libavformat/sbgdec.c b/ffmpeg/libavformat/sbgdec.c
index 36cd8a3ce29305b5712f0899df8be3d41094bb57..32822fb48fee0b901a1021bb0cec655ef47080b1 100644 (file)
--- a/ffmpeg/libavformat/sbgdec.c
+++ b/ffmpeg/libavformat/sbgdec.c
@@ -25,6 +25,7 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "libavutil/time_internal.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -905,14 +906,14 @@ static void expand_timestamps(void *log, struct sbg_script *s)
     } else {
         /* Mixed relative/absolute ts: expand */
         time_t now0;
-        struct tm *tm;
+        struct tm *tm, tmpbuf;
 
         av_log(log, AV_LOG_WARNING,
                "Scripts with mixed absolute and relative timestamps can give "
                "unexpected results (pause, seeking, time zone change).\n");
 #undef time
         time(&now0);
-        tm = localtime(&now0);
+        tm = localtime_r(&now0, &tmpbuf);
         now = tm ? tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec :
                    now0 % DAY;
         av_log(log, AV_LOG_INFO, "Using %02d:%02d:%02d as NOW.\n",