[FFmpeg-cvslog] avformat/sbgdec: Use localtime_r() for thread saftey
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:08:59 2014 +0100| [5ece4f8b7362653c932e58a1c7a0456897d06702] | committer: Michael Niedermayer
avformat/sbgdec: Use localtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ece4f8b7362653c932e58a1c7a0456897d06702
---
libavformat/sbgdec.c | 5 +++--
1 file 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",
More information about the ffmpeg-cvslog
mailing list