[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.41,1.42 stream.h,1.39,1.40

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv14526

Modified Files:
	open.c stream.h 
Log Message:
DVDKIT support

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- open.c	3 Apr 2002 17:55:31 -0000	1.41
+++ open.c	24 Apr 2002 21:19:09 -0000	1.42
@@ -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))
 
 /*

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stream.h	3 Apr 2002 17:50:48 -0000	1.39
+++ stream.h	24 Apr 2002 21:19:09 -0000	1.40
@@ -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