# HG changeset patch # User diego # Date 1163810716 0 # Node ID 4da452b25fd5f1807b6e9815c755f1531ba7b604 # Parent 5f893a1f25f93838c9135719134102881a5aaf88 Drop some unnecessary local changes. diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/dvd_input.c --- a/dvdread/dvd_input.c Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/dvd_input.c Sat Nov 18 00:45:16 2006 +0000 @@ -41,7 +41,7 @@ #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ -#include "dvdcss/dvdcss.h" +#include #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/ifo_print.h --- a/dvdread/ifo_print.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/ifo_print.h Sat Nov 18 00:45:16 2006 +0000 @@ -5,10 +5,6 @@ * Copyright (C) 2000, 2001 Björn Englund , * Håkan Hjort * - * Modified for use with MPlayer, changes contained in libdvdread_changes.diff. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -24,8 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ifo_types.h" -#include "dvd_reader.h" +#include +#include #ifdef __cplusplus extern "C" { diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/ifo_read.h --- a/dvdread/ifo_read.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/ifo_read.h Sat Nov 18 00:45:16 2006 +0000 @@ -5,10 +5,6 @@ * Copyright (C) 2000, 2001, 2002 Björn Englund , * Håkan Hjort * - * Modified for use with MPlayer, changes contained in libdvdread_changes.diff. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -24,8 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ifo_types.h" -#include "dvd_reader.h" +#include +#include #ifdef __cplusplus extern "C" { diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/ifo_types.h --- a/dvdread/ifo_types.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/ifo_types.h Sat Nov 18 00:45:16 2006 +0000 @@ -25,7 +25,7 @@ */ #include -#include "dvd_reader.h" +#include #undef ATTRIBUTE_PACKED diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/libdvdread_changes.diff --- a/dvdread/libdvdread_changes.diff Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/libdvdread_changes.diff Sat Nov 18 00:45:16 2006 +0000 @@ -64,15 +64,6 @@ diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c --- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200 -@@ -37,7 +41,7 @@ - - #ifdef HAVE_DVDCSS_DVDCSS_H - /* linking to libdvdcss */ --#include -+#include "dvdcss/dvdcss.h" - #define DVDcss_open(a) dvdcss_open((char*)(a)) - #define DVDcss_close dvdcss_close - #define DVDcss_seek dvdcss_seek @@ -74,7 +78,7 @@ dvd_input_t dev; @@ -306,20 +297,6 @@ i, pgc->subp_control[i]); } -diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h ---- dvdread.orig/ifo_print.h 2002-08-15 22:13:21.000000000 +0200 -+++ dvdread/ifo_print.h 2005-12-29 13:13:21.000000000 +0100 -@@ -20,8 +24,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include --#include -+#include "ifo_types.h" -+#include "dvd_reader.h" - - #ifdef __cplusplus - extern "C" { diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c --- dvdread.orig/ifo_read.c 30 Jun 2005 22:48:26 -0000 1.4 +++ dvdread/ifo_read.c 3 Oct 2005 14:29:01 -0000 1.5 @@ -645,32 +622,9 @@ return 0; } -diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h ---- dvdread.orig/ifo_read.h 2005-06-23 00:18:54.000000000 +0200 -+++ dvdread/ifo_read.h 2005-06-23 00:19:10.000000000 +0200 -@@ -20,8 +24,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include --#include -+#include "ifo_types.h" -+#include "dvd_reader.h" - - #ifdef __cplusplus - extern "C" { diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h --- dvdread.orig/ifo_types.h 2005-06-23 00:18:54.000000000 +0200 +++ dvdread/ifo_types.h 2005-06-23 00:19:10.000000000 +0200 -@@ -21,7 +25,7 @@ - */ - - #include --#include -+#include "dvd_reader.h" - - - #undef ATTRIBUTE_PACKED @@ -394,6 +398,55 @@ } ATTRIBUTE_PACKED user_ops_t; @@ -738,41 +692,3 @@ uint16_t next_pgc_nr; uint16_t prev_pgc_nr; uint16_t goup_pgc_nr; -diff -Naur dvdread.orig/nav_print.c dvdread/nav_print.c -diff -Naur dvdread.orig/nav_print.h dvdread/nav_print.h ---- dvdread.orig/nav_print.h 2005-06-23 00:18:54.000000000 +0200 -+++ dvdread/nav_print.h 2005-06-23 00:19:10.000000000 +0200 -@@ -20,7 +24,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include "nav_types.h" - - /** - * Pretty printing of the NAV packets, PCI and DSI structs. -diff -Naur dvdread.orig/nav_read.c dvdread/nav_read.c -diff -Naur dvdread.orig/nav_read.h dvdread/nav_read.h ---- dvdread.orig/nav_read.h 2005-06-23 00:18:54.000000000 +0200 -+++ dvdread/nav_read.h 2005-06-23 00:19:10.000000000 +0200 -@@ -19,7 +23,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include "nav_types.h" - - /** - * Parsing of NAV data, PCI and DSI parts. -diff -Naur dvdread.orig/nav_types.h dvdread/nav_types.h ---- dvdread.orig/nav_types.h 2005-06-23 00:18:54.000000000 +0200 -+++ dvdread/nav_types.h 2005-06-23 00:19:10.000000000 +0200 -@@ -30,7 +34,7 @@ - */ - - #include --#include /* only dvd_time_t, vm_cmd_t and user_ops_t */ -+#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ - - - #undef ATTRIBUTE_PACKED diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/nav_print.h --- a/dvdread/nav_print.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/nav_print.h Sat Nov 18 00:45:16 2006 +0000 @@ -5,10 +5,6 @@ * Copyright (C) 2001, 2002 Billy Biggs , * Håkan Hjort * - * Modified for use with MPlayer, changes contained in libdvdread_changes.diff. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at @@ -24,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "nav_types.h" +#include /** * Pretty printing of the NAV packets, PCI and DSI structs. diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/nav_read.h --- a/dvdread/nav_read.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/nav_read.h Sat Nov 18 00:45:16 2006 +0000 @@ -4,10 +4,6 @@ /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort . * - * Modified for use with MPlayer, changes contained in libdvdread_changes.diff. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -23,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "nav_types.h" +#include /** * Parsing of NAV data, PCI and DSI parts. diff -r 5f893a1f25f9 -r 4da452b25fd5 dvdread/nav_types.h --- a/dvdread/nav_types.h Sat Nov 18 00:42:25 2006 +0000 +++ b/dvdread/nav_types.h Sat Nov 18 00:45:16 2006 +0000 @@ -4,10 +4,6 @@ /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort * - * Modified for use with MPlayer, changes contained in libdvdread_changes.diff. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ - * * The data structures in this file should represent the layout of the * pci and dsi packets as they are stored in the stream. Information * found by reading the source to VOBDUMP is the base for the structure @@ -34,7 +30,7 @@ */ #include -#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ +#include /* only dvd_time_t, vm_cmd_t and user_ops_t */ #undef ATTRIBUTE_PACKED