Mercurial > mplayer.hg

changeset 5819:194bca17117b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DVDKIT support
author arpi
date Wed, 24 Apr 2002 21:19:09 +0000
parents 563facc2b48a
children 361067944939
files libmpdemux/open.c libmpdemux/stream.h
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/open.c	Wed Apr 24 21:17:22 2002 +0000
+++ b/libmpdemux/open.c	Wed Apr 24 21:19:09 2002 +0000
@@ -39,11 +39,6 @@
 
 #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))
 
 /*
--- a/libmpdemux/stream.h	Wed Apr 24 21:17:22 2002 +0000
+++ b/libmpdemux/stream.h	Wed Apr 24 21:19:09 2002 +0000
@@ -208,10 +208,17 @@
 
 #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