summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-09 19:35:55 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-09 19:35:55 +0000
commitb39852672b31c9f8ba4adf65fdad62f0c250af49 (patch)
tree1ca345688cd7385b96eda4930820d6d19940a5ec /stream
parent3cfd6d9a9492c695731bfef0aadd0751f56741c8 (diff)
downloadmpv-b39852672b31c9f8ba4adf65fdad62f0c250af49.tar.bz2
mpv-b39852672b31c9f8ba4adf65fdad62f0c250af49.tar.xz
detect dvdnav before mpdvdkit and dvdread; if dvdnav is set mplayer will use the version of dvdread embedded in dvdnav
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19769 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index f734dc4c04..4968e752a8 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -6,6 +6,11 @@
#include "libmpdvdkit2/ifo_types.h"
#include "libmpdvdkit2/ifo_read.h"
#include "libmpdvdkit2/nav_read.h"
+#elif defined(USE_DVDNAV)
+#include <dvd_reader.h>
+#include <ifo_types.h>
+#include <ifo_read.h>
+#include <nav_read.h>
#else
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>