diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-24 21:19:09 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-24 21:19:09 +0000 |
| commit | df99229f5745da0693b62ec589c85d5bd8f55201 (patch) | |
| tree | 0ae524c3209cb590b4f0ab4c625ca852d958e433 /libmpdemux | |
| parent | 9ab8950460f60af7b94c0d1286fcaea048706725 (diff) | |
| download | mpv-df99229f5745da0693b62ec589c85d5bd8f55201.tar.bz2 mpv-df99229f5745da0693b62ec589c85d5bd8f55201.tar.xz | |
DVDKIT support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5820 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/open.c | 5 | ||||
| -rw-r--r-- | libmpdemux/stream.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index b3a33f9f54..0d46f876d3 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -39,11 +39,6 @@ int dvd_nav=0; /* use libdvdnav? */ #ifdef USE_DVDREAD -#include <dvdread/dvd_reader.h> -#include <dvdread/ifo_types.h> -#include <dvdread/ifo_read.h> -#include <dvdread/nav_read.h> - #define DVDREAD_VERSION(maj,min,micro) ((maj)*10000 + (min)*100 + (micro)) /* diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index 2cf62c5de1..c5d4dc465f 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -208,10 +208,17 @@ int dvd_parse_chapter_range(struct config*, const char*); #ifdef USE_DVDREAD +#ifdef USE_MPDVDKIT +#include "../libmpdvdkit/dvd_reader.h" +#include "../libmpdvdkit/ifo_types.h" +#include "../libmpdvdkit/ifo_read.h" +#include "../libmpdvdkit/nav_read.h" +#else #include <dvdread/dvd_reader.h> #include <dvdread/ifo_types.h> #include <dvdread/ifo_read.h> #include <dvdread/nav_read.h> +#endif typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm |