[FFmpeg-cvslog] avformat: Interpret times in ff_iso8601_to_unix_time as UTC

Martin Storsjö git at videolan.org
Thu Nov 17 03:01:32 CET 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Nov  7 23:32:21 2011 +0200| [4a835416508820de383cda8cc906b6f1bd938889] | committer: Martin Storsjö

avformat: Interpret times in ff_iso8601_to_unix_time as UTC

This function is used in muxers for parsing the 'creation_time'
metadata key, for converting it to a time value.

This makes it match the behaviour of the exported 'creation_time'
metadata from demuxers, where it is in UTC, too.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/utils.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 11cb4f8..dfcac20 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -32,6 +32,7 @@
 #include "id3v2.h"
 #include "libavutil/avstring.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/parseutils.h"
 #include "riff.h"
 #include "audiointerleave.h"
 #include "url.h"
@@ -3944,7 +3945,7 @@ int64_t ff_iso8601_to_unix_time(const char *datestr)
 #if HAVE_STRPTIME
     struct tm time = {0};
     strptime(datestr, "%Y - %m - %dT%T", &time);
-    return mktime(&time);
+    return av_timegm(&time);
 #else
     av_log(NULL, AV_LOG_WARNING, "strptime() unavailable on this system, cannot convert "
                                  "the date string.\n");



More information about the ffmpeg-cvslog mailing list