virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf/vplayerdec: support time durations with no ms specified

Browse Source 
Example found in the wild:

0:00:03:25.000
0:01:47:A legend is sung
0:01:50:Of when England was young
0:01:53:And knights|were brave and bold
0:01:59:The good king had died

Reported-by: wm4
This commit is contained in:
Clément Bœsch 2016-03-07 12:43:42 +01:00 committed by Clément Bœsch
parent 81f14884b5
commit 920f592b81
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/vplayerdec.c
View File

@ -36,7 +36,8 @@ static int vplayer_probe(AVProbeData *p)
char c;
const unsigned char *ptr = p->buf;
if (sscanf(ptr, "%*d:%*d:%*d.%*d%c", &c) == 1 && strchr(": =", c))
if ((sscanf(ptr, "%*d:%*d:%*d.%*d%c", &c) == 1 ||
sscanf(ptr, "%*d:%*d:%*d%c", &c) == 1) && strchr(": =", c))
return AVPROBE_SCORE_MAX;
return 0;
}
@ -44,12 +45,12 @@ static int vplayer_probe(AVProbeData *p)
static int64_t read_ts(char **line)
{
char c;
int hh, mm, ss, ms, len;
int hh, mm, ss, ms, n, len;
if (sscanf(*line, "%d:%d:%d.%d%c%n",
&hh, &mm, &ss, &ms, &c, &len) >= 5) {
if (((n = sscanf(*line, "%d:%d:%d.%d%c%n", &hh, &mm, &ss, &ms, &c, &len)) >= 5 ||
(n = sscanf(*line, "%d:%d:%d%c%n", &hh, &mm, &ss, &c, &len)) >= 4) && strchr(": =", c)) {
*line += len;
return (hh*3600LL + mm*60LL + ss) * 100LL + ms;
return (hh*3600LL + mm*60LL + ss) * 100LL + (n < 5 ? 0 : ms);
}
return AV_NOPTS_VALUE;
}