From 3d28621ce9b29e6f222f6d86c2a880460a3ce0c2 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Thu, 6 Mar 2003 23:18:42 +0000 Subject: use our modified internal version of nav_types.h, the one from libdvdread cannot be used any more, since the structures in there differ from what is actually on the disc CVS patchset: 4348 CVS date: 2003/03/06 23:18:42 --- src/input/libdvdnav/diff_against_cvs.patch | 6 +++--- src/input/libdvdnav/dvdnav_events.h | 4 ++-- src/input/libdvdnav/highlight.c | 4 ++-- src/input/libdvdnav/searching.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index 443ab73f5..7c7b109d8 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -63,7 +63,7 @@ -#include -#include +#include "ifo_types.h" -+#include "nav_types.h" ++#include "../../libspudec/nav_types.h" +#include "dvd_reader.h" /** @@ -95,7 +95,7 @@ #include "vm.h" -#include -+#include "nav_types.h" ++#include "../../libspudec/nav_types.h" /* #define BUTTON_TESTING @@ -115,7 +115,7 @@ #include "vm.h" -#include -+#include "nav_types.h" ++#include "../../libspudec/nav_types.h" /* #define LOG_DEBUG diff --git a/src/input/libdvdnav/dvdnav_events.h b/src/input/libdvdnav/dvdnav_events.h index e7449fac2..bb297f85d 100644 --- a/src/input/libdvdnav/dvdnav_events.h +++ b/src/input/libdvdnav/dvdnav_events.h @@ -17,7 +17,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: dvdnav_events.h,v 1.5 2003/02/26 20:44:13 mroi Exp $ + * $Id: dvdnav_events.h,v 1.6 2003/03/06 23:18:42 mroi Exp $ * */ @@ -25,7 +25,7 @@ #define DVDNAV_EVENTS_H_INCLUDED #include "ifo_types.h" -#include "nav_types.h" +#include "../../libspudec/nav_types.h" #include "dvd_reader.h" /** diff --git a/src/input/libdvdnav/highlight.c b/src/input/libdvdnav/highlight.c index 98dc772de..9a6e54881 100644 --- a/src/input/libdvdnav/highlight.c +++ b/src/input/libdvdnav/highlight.c @@ -17,7 +17,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: highlight.c,v 1.8 2003/02/26 20:44:15 mroi Exp $ + * $Id: highlight.c,v 1.9 2003/03/06 23:18:43 mroi Exp $ * */ @@ -30,7 +30,7 @@ #include "dvdnav_internal.h" #include "vm.h" -#include "nav_types.h" +#include "../../libspudec/nav_types.h" /* #define BUTTON_TESTING diff --git a/src/input/libdvdnav/searching.c b/src/input/libdvdnav/searching.c index 4cdb2348b..a3b662534 100644 --- a/src/input/libdvdnav/searching.c +++ b/src/input/libdvdnav/searching.c @@ -17,7 +17,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: searching.c,v 1.8 2003/02/20 16:02:00 mroi Exp $ + * $Id: searching.c,v 1.9 2003/03/06 23:18:43 mroi Exp $ * */ @@ -30,7 +30,7 @@ #include "dvdnav_internal.h" #include "vm.h" -#include "nav_types.h" +#include "../../libspudec/nav_types.h" /* #define LOG_DEBUG -- cgit v1.2.3