diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-03-03 23:17:46 +0300 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-03-05 23:38:35 +0300 |
| commit | 8218249f1f04de65904f58519bde21948e5a0783 (patch) | |
| tree | c2c34cd4fc0046355ab4728030da17ab06c08cf3 /libavutil | |
| parent | 5787908e8c63bcb9206a59961031bdb54682ab0a (diff) | |
parseutils: accept only full "ms" suffix
The commit which added those was pushed prematurely before anyone could object
to illogical suffixes like just m for milliseconds. Without this, we'd be locked
into never being able to implement the "m" suffix for minutes.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/parseutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 44c845577a..95274f564f 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -689,10 +689,10 @@ 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 == 'm') { + if (q[0] == 'm' && q[1] == 's') { suffix = 1000; microseconds /= 1000; - q++; + q += 2; } else if (*q == 'u') { suffix = 1; microseconds = 0; |