OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
58dc8bb
)
avutil/parseutils: dont assume standard time when parsing a timestamp
author
Marton Balint
<cus@passwd.hu>
Wed, 29 Jun 2016 20:37:25 +0000
(22:37 +0200)
committer
Marton Balint
<cus@passwd.hu>
Sun, 10 Jul 2016 23:06:23 +0000
(
01:06
+0200)
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
libavutil/parseutils.c
patch
|
blob
|
history
diff --git
a/libavutil/parseutils.c
b/libavutil/parseutils.c
index
a4efd79
..
86d3dac
100644
(file)
--- 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;
}