diff options
| author | Marton Balint <cus@passwd.hu> | 2016-06-29 22:37:25 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-07-11 01:06:23 +0200 |
| commit | 593987810ef88bcc9b3d6aa7ba83fe68728c9dfa (patch) | |
| tree | 5d56f657c08a9ad4b533ef8862588003098b6482 | |
| parent | 58dc8bbca48578f1be44f39c45c30e5796d8fc9f (diff) | |
| download | ffmpeg-593987810ef88bcc9b3d6aa7ba83fe68728c9dfa.tar.gz | |
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>
| -rw-r--r-- | libavutil/parseutils.c | 1 |
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; } |