diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /sub/vobsub.c | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'sub/vobsub.c')
| -rw-r--r-- | sub/vobsub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/vobsub.c b/sub/vobsub.c index bfee3eb98f..2f3ba9e1e1 100644 --- a/sub/vobsub.c +++ b/sub/vobsub.c @@ -695,8 +695,8 @@ static int vobsub_parse_id(vobsub_t *vob, const char *line) static int vobsub_parse_timestamp(vobsub_t *vob, const char *line) { int h, m, s, ms; - off_t filepos; - if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09lx", + int64_t filepos; + if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09"SCNx64, &h, &m, &s, &ms, &filepos) != 5) return -1; return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h))); |