From 12a269a5229d3a37be0743fc9655f743ebc44b6e Mon Sep 17 00:00:00 2001 From: Senthilnathan M Date: Wed, 20 Feb 2013 09:51:06 +0530 Subject: lavu/parseutils: allow MM:SS format for duration in av_parse_time() Fix trac ticket #2258. Signed-off-by: Senthilnathan M Signed-off-by: Stefano Sabatini --- libavutil/parseutils.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavutil/parseutils.c') diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 73e400a..c67f971 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -588,6 +588,11 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) /* parse timestr as HH:MM:SS */ q = av_small_strptime(p, "%J:%M:%S", &dt); if (!q) { + /* parse timestr as MM:SS */ + q = av_small_strptime(p, "%M:%S", &dt); + dt.tm_hour = 0; + } + if (!q) { /* parse timestr as S+ */ dt.tm_sec = strtol(p, (void *)&q, 10); if (q == p) /* the parsing didn't succeed */ -- cgit v1.1