diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /loader | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/dshow/libwin32.h | 2 | ||||
| -rw-r--r-- | loader/registry.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index 7570072649..509941432b 100644 --- a/loader/dshow/libwin32.h +++ b/loader/dshow/libwin32.h @@ -17,7 +17,7 @@ typedef uint32_t fourcc_t; typedef struct FatalError { FatalError(); - void PrintAll() {} + void PrintAll(void) {} }FatalError; */ diff --git a/loader/registry.c b/loader/registry.c index 50912aa4dd..01c6321ec5 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -21,11 +21,11 @@ #include "ext.h" #include "registry.h" +#include "get_path.h" + //#undef TRACE //#define TRACE printf -char *get_path(const char*); - // ...can be set before init_registry() call char* regpathname = NULL; |