diff options
| author | trav90 <travawine@palemoon.org> | 2018-09-30 10:40:30 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-09-30 10:40:30 -0500 |
| commit | edc124b92beccd55e5277062e95efb62a8b3ec7b (patch) | |
| tree | 3486b32f85152ff76b1bee03a8d84b3c34c70a5f /media/ffvpx/libavutil/parseutils.c | |
| parent | 8ba6dd1bd12a3d13f9e2c683216dd8778011a72e (diff) | |
| download | UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.gz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.lz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.xz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.zip | |
[ffvpx] Update ffvp9/ffvp8 to release 4.0.2
Diffstat (limited to 'media/ffvpx/libavutil/parseutils.c')
| -rw-r--r-- | media/ffvpx/libavutil/parseutils.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c index be4ea1ee1..9de19d1c1 100644 --- a/media/ffvpx/libavutil/parseutils.c +++ b/media/ffvpx/libavutil/parseutils.c @@ -590,7 +590,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) int64_t t, now64; time_t now; struct tm dt = { 0 }, tmbuf; - int today = 0, negative = 0, microseconds = 0; + int today = 0, negative = 0, microseconds = 0, suffix = 1000000; int i; static const char * const date_fmt[] = { "%Y - %m - %d", @@ -689,6 +689,16 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) if (duration) { t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec; + if (q[0] == 'm' && q[1] == 's') { + suffix = 1000; + microseconds /= 1000; + q += 2; + } else if (q[0] == 'u' && q[1] == 's') { + suffix = 1; + microseconds = 0; + q += 2; + } else if (*q == 's') + q++; } else { int is_utc = *q == 'Z' || *q == 'z'; int tzoffset = 0; @@ -724,7 +734,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) if (*q) return AVERROR(EINVAL); - t *= 1000000; + t *= suffix; t += microseconds; *timeval = negative ? -t : t; return 0; |