summaryrefslogtreecommitdiffstats
path: root/media/ffvpx/libavutil/parseutils.c
diff options
context:
space:
mode:
authortrav90 <travawine@openmailbox.org>2018-02-04 13:19:22 -0600
committertrav90 <travawine@openmailbox.org>2018-02-04 13:19:22 -0600
commit30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (patch)
treea6031d45b30f0b5b66e2b1774d75b0f953a2aedc /media/ffvpx/libavutil/parseutils.c
parentfc7d9fade54dfbe275c4808dabe30a19415082e0 (diff)
downloadUXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.gz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.lz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.xz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.zip
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavutil/parseutils.c')
-rw-r--r--media/ffvpx/libavutil/parseutils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c
index 6be3730f4..a2464cfc6 100644
--- a/media/ffvpx/libavutil/parseutils.c
+++ b/media/ffvpx/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;
}