diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2014-02-13 18:18:58 +1100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-04-21 02:57:16 +0200 |
| commit | 0cef033d4897a0b5878c4213556ba0937bd1ff91 (patch) | |
| tree | 67a2edd039775840d60cd143efe48d8328d702e4 /demux | |
| parent | ff9ac834191aca42ac16007ac136ab0495e02a18 (diff) | |
| download | mpv-0cef033d4897a0b5878c4213556ba0937bd1ff91.tar.bz2 mpv-0cef033d4897a0b5878c4213556ba0937bd1ff91.tar.xz | |
glob-win: support Unicode
glob-win.c wasn't big, so it was easier to rewrite it. The new version
supports Unicode, handles directories properly, sorts the output and
puts all its allocations in the same talloc context to simplify the
implementation of globfree.
Notably, the old glob had error checking code, but didn't do anything
with the errors since the error reporting code was commented out. The
new glob doesn't copy this behaviour. It just treats errors as if there
were no more matching files, which shouldn't matter for mpv, since it
ignores glob errors too.
To match the other Windows I/O helper functions, the definition is moved
to osdep/io.h.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/mf.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/demux/mf.c b/demux/mf.c index b538943aff..04c99a3bcc 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -26,16 +26,8 @@ #include <limits.h> #include <sys/types.h> -#include "osdep/io.h" - #include "config.h" - -#if HAVE_GLOB -#include <glob.h> -#else -#include "osdep/glob.h" -#endif - +#include "osdep/io.h" #include "talloc.h" #include "common/msg.h" #include "stream/stream.h" |