summaryrefslogtreecommitdiff
path: root/src/input/input_dvd.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-04-29 15:58:27 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-04-29 15:58:27 +0000
commit12018188e9317c2092a3e12db8672b25b1e4bbad (patch)
treeb8767c519dacf4b3ed86688070cb56dfd6923c7d /src/input/input_dvd.c
parenta23c0fad73df02e6419a01a1c07923876c3e8436 (diff)
downloadxine-lib-12018188e9317c2092a3e12db8672b25b1e4bbad.tar.gz
xine-lib-12018188e9317c2092a3e12db8672b25b1e4bbad.tar.bz2
Update from the libdvdnav project.
CVS patchset: 4708 CVS date: 2003/04/29 15:58:27
Diffstat (limited to 'src/input/input_dvd.c')
-rw-r--r--src/input/input_dvd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 447373076..612c35366 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.156 2003/04/26 22:34:32 guenter Exp $
+ * $Id: input_dvd.c,v 1.157 2003/04/29 15:58:28 jcdutton Exp $
*
*/
@@ -85,17 +85,16 @@
#ifdef HAVE_DVDNAV
#ifndef _MSC_VER
# include <dvdnav/dvdnav.h>
+# include <dvdnav/nav_read.h>
#else
# include "dvdnav.h"
+# include "nav_read.h"
#endif /* _MSC_VER */
#else
# define DVDNAV_COMPILE
# include "dvdnav.h"
#endif
-/* libdvdread includes */
-#include "nav_read.h"
-
/* Xine includes */
#include "xineutils.h"
#include "buffer.h"
@@ -1616,6 +1615,9 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.157 2003/04/29 15:58:28 jcdutton
+ * Update from the libdvdnav project.
+ *
* Revision 1.156 2003/04/26 22:34:32 guenter
* bump up input plugin interface version number
*