Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2016-06-29 23:37:25 +0300
committerMarton Balint <cus@passwd.hu>2016-07-11 02:06:23 +0300
commit593987810ef88bcc9b3d6aa7ba83fe68728c9dfa (patch)
tree5d56f657c08a9ad4b533ef8862588003098b6482 /libavutil
parent58dc8bbca48578f1be44f39c45c30e5796d8fc9f (diff)
avutil/parseutils: dont assume standard time when parsing a timestamp
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/parseutils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index a4efd79628..86d3dac57c 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -687,6 +687,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
dt2.tm_sec = dt.tm_sec;
dt = dt2;
}
+ dt.tm_isdst = is_utc ? 0 : -1;
t = is_utc ? av_timegm(&dt) : mktime(&dt);
t += tzoffset;
}