summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/diff_against_cvs.patch
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-03-08 14:36:13 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-03-08 14:36:13 +0000
commitdf97e6a06ec6072e095dce63983e1e9865667a77 (patch)
tree0e47cec09569f8e9f3210a9b6fa844597f25a7c9 /src/input/libdvdnav/diff_against_cvs.patch
parent909a84f95ac808f5b4881bb43fa4ea235345140f (diff)
downloadxine-lib-df97e6a06ec6072e095dce63983e1e9865667a77.tar.gz
xine-lib-df97e6a06ec6072e095dce63983e1e9865667a77.tar.bz2
syncing libdvdnav to cvs should fix remaining highlight problems
CVS patchset: 4375 CVS date: 2003/03/08 14:36:13
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index 7c7b109d8..d9d033124 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -60,11 +60,11 @@
#define DVDNAV_EVENTS_H_INCLUDED
-#include <dvdread/ifo_types.h>
--#include <dvdread/nav_types.h>
-#include <dvdread/dvd_reader.h>
+-#include <dvdread/nav_types.h>
+#include "ifo_types.h"
-+#include "../../libspudec/nav_types.h"
+#include "dvd_reader.h"
++#include "nav_types.h"
/**
* \file dvdnav_events.h
@@ -95,7 +95,7 @@
#include "vm.h"
-#include <dvdread/nav_types.h>
-+#include "../../libspudec/nav_types.h"
++#include "nav_types.h"
/*
#define BUTTON_TESTING
@@ -108,17 +108,6 @@
#include "vmcmd.h"
static void print_time(dvd_time_t *dtime) {
---- src/input/libdvdnav/searching.c Fri Jul 26 12:58:10 2002
-+++ src/input/libdvdnav/searching.c Fri Aug 9 22:03:20 2002
-@@ -30,7 +30,7 @@
- #include "dvdnav_internal.h"
-
- #include "vm.h"
--#include <dvdread/nav_types.h>
-+#include "../../libspudec/nav_types.h"
-
- /*
- #define LOG_DEBUG
--- src/input/libdvdnav/vm.c Sat Jul 6 18:12:09 2002
+++ src/input/libdvdnav/vm.c Fri Aug 9 22:03:48 2002
@@ -37,8 +37,8 @@