summaryrefslogtreecommitdiffstats
path: root/libavformat/sbgdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-02 20:08:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-02 20:08:59 +0100
commit5ece4f8b7362653c932e58a1c7a0456897d06702 (patch)
tree0d6aef4492efed2891672780f1c1dce3b3770bee /libavformat/sbgdec.c
parent76886589eea7172f3a1fe8535e2c679abcc3ea51 (diff)
downloadffmpeg-streaming-5ece4f8b7362653c932e58a1c7a0456897d06702.zip
ffmpeg-streaming-5ece4f8b7362653c932e58a1c7a0456897d06702.tar.gz
avformat/sbgdec: Use localtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sbgdec.c')
-rw-r--r--libavformat/sbgdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index 36cd8a3..32822fb 100644
--- a/libavformat/sbgdec.c
+++ b/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",
OpenPOWER on IntegriCloud