Commit 5ece4f8b authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/sbgdec: Use localtime_r() for thread saftey

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 76886589
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/time_internal.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
...@@ -905,14 +906,14 @@ static void expand_timestamps(void *log, struct sbg_script *s) ...@@ -905,14 +906,14 @@ static void expand_timestamps(void *log, struct sbg_script *s)
} else { } else {
/* Mixed relative/absolute ts: expand */ /* Mixed relative/absolute ts: expand */
time_t now0; time_t now0;
struct tm *tm; struct tm *tm, tmpbuf;
av_log(log, AV_LOG_WARNING, av_log(log, AV_LOG_WARNING,
"Scripts with mixed absolute and relative timestamps can give " "Scripts with mixed absolute and relative timestamps can give "
"unexpected results (pause, seeking, time zone change).\n"); "unexpected results (pause, seeking, time zone change).\n");
#undef time #undef time
time(&now0); time(&now0);
tm = localtime(&now0); tm = localtime_r(&now0, &tmpbuf);
now = tm ? tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec : now = tm ? tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec :
now0 % DAY; now0 % DAY;
av_log(log, AV_LOG_INFO, "Using %02d:%02d:%02d as NOW.\n", av_log(log, AV_LOG_INFO, "Using %02d:%02d:%02d as NOW.\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment