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 /stream/stream_dvd_common.c | |
| 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 'stream/stream_dvd_common.c')
| -rw-r--r-- | stream/stream_dvd_common.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index e2cf3690ba..55bee132b7 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -1,10 +1,6 @@ #include "config.h" #include <inttypes.h> -#ifdef CONFIG_DVDREAD_INTERNAL -#include "libdvdread/ifo_types.h" -#else #include <dvdread/ifo_types.h> -#endif #include "stream_dvd_common.h" /** |