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 | |
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')
-rw-r--r-- | sub/find_subfiles.c | 2 | ||||
-rw-r--r-- | sub/font_load.c | 10 | ||||
-rw-r--r-- | sub/vobsub.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index 3de8014ce1..6af599183f 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -4,6 +4,8 @@ #include <ctype.h> #include <assert.h> +#include "osdep/io.h" + #include "mp_msg.h" #include "options.h" #include "path.h" diff --git a/sub/font_load.c b/sub/font_load.c index 7bf7775501..d8f9eafe34 100644 --- a/sub/font_load.c +++ b/sub/font_load.c @@ -21,9 +21,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> + +#include "osdep/io.h" #include "font_load.h" #include "mp_msg.h" @@ -72,7 +71,6 @@ unsigned char sor2[1024]; font_desc_t *desc; FILE *f = NULL; char *dn; -//struct stat fstate; char section[64]; int i,j; int chardb=0; @@ -93,10 +91,6 @@ if ((dn = malloc(i+1))){ desc->fpath = dn; // search in the same dir as fonts.desc -// desc->fpath=get_path("font/"); -// if (stat(desc->fpath, &fstate)!=0) desc->fpath=DATADIR"/font"; - - // set up some defaults, and erase table 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))); |