diff options
author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /sub/find_subfiles.c | |
parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'sub/find_subfiles.c')
-rw-r--r-- | sub/find_subfiles.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index b073a722c6..2e705bd4d1 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -12,6 +12,7 @@ #include "mpcommon.h" #include "sub/find_subfiles.h" #include "sub/sub.h" +#include "sub/subreader.h" static struct bstr strip_ext(struct bstr str) { |