Drop some unnecessary local changes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20999 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 9 insertions, 113 deletions

diff --git a/dvdread/dvd_input.c b/dvdread/dvd_input.c
index 8478970a6d..341c9882d4 100644
--- a/dvdread/dvd_input.c
+++ b/dvdread/dvd_input.c
@@ -41,7 +41,7 @@ char *      (*dvdinput_error) (dvd_input_t);
 
 #ifdef HAVE_DVDCSS_DVDCSS_H
 /* linking to libdvdcss */
-#include "dvdcss/dvdcss.h"
+#include <dvdcss/dvdcss.h>
 #define DVDcss_open(a) dvdcss_open((char*)(a))
 #define DVDcss_close   dvdcss_close
 #define DVDcss_seek    dvdcss_seek
diff --git a/dvdread/ifo_print.h b/dvdread/ifo_print.h
index c6e24f6a74..7a4169c0b6 100644
--- a/dvdread/ifo_print.h
+++ b/dvdread/ifo_print.h
@@ -5,10 +5,6 @@
  * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
- * 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 <dvdread/ifo_types.h>
+#include <dvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_read.h b/dvdread/ifo_read.h
index d64f6e712c..b6bd5989e1 100644
--- a/dvdread/ifo_read.h
+++ b/dvdread/ifo_read.h
@@ -5,10 +5,6 @@
  * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>,
  *                                Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
- * 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 <dvdread/ifo_types.h>
+#include <dvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_types.h b/dvdread/ifo_types.h
index 4eb6144e1c..6f66957349 100644
--- a/dvdread/ifo_types.h
+++ b/dvdread/ifo_types.h
@@ -25,7 +25,7 @@
  */
 
 #include <inttypes.h>
-#include "dvd_reader.h"
+#include <dvdread/dvd_reader.h>
 
 
 #undef ATTRIBUTE_PACKED
diff --git a/dvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff
index ab3ab92b73..b7ba06afa6 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/dvdread/libdvdread_changes.diff
@@ -64,15 +64,6 @@ diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore
 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 <dvdcss/dvdcss.h>
-+#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 @@ diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c
  	     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 <dvdread/ifo_types.h>
--#include <dvdread/dvd_reader.h>
-+#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 @@ diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c
      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 <dvdread/ifo_types.h>
--#include <dvdread/dvd_reader.h>
-+#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 <inttypes.h>
--#include <dvdread/dvd_reader.h>
-+#include "dvd_reader.h"
- 
- 
- #undef ATTRIBUTE_PACKED
 @@ -394,6 +398,55 @@
  } ATTRIBUTE_PACKED user_ops_t;
  
@@ -738,41 +692,3 @@ diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h
    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 <dvdread/nav_types.h>
-+#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 <dvdread/nav_types.h>
-+#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 <inttypes.h>
--#include <dvdread/ifo_types.h> /* 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 --git a/dvdread/nav_print.h b/dvdread/nav_print.h
index 3a3354277f..92ea02b99a 100644
--- a/dvdread/nav_print.h
+++ b/dvdread/nav_print.h
@@ -5,10 +5,6 @@
  * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
  *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
- * 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 <dvdread/nav_types.h>
 
 /**
  * Pretty printing of the NAV packets, PCI and DSI structs.
diff --git a/dvdread/nav_read.h b/dvdread/nav_read.h
index 88c46d93bc..360fbd4267 100644
--- a/dvdread/nav_read.h
+++ b/dvdread/nav_read.h
@@ -4,10 +4,6 @@
 /*
  * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>.
  *
- * 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 <dvdread/nav_types.h>
 
 /**
  * Parsing of NAV data, PCI and DSI parts.
diff --git a/dvdread/nav_types.h b/dvdread/nav_types.h
index 8800e7f894..c9fc3da60f 100644
--- a/dvdread/nav_types.h
+++ b/dvdread/nav_types.h
@@ -4,10 +4,6 @@
 /*
  * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
- * 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 <inttypes.h>
-#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
 
 
 #undef ATTRIBUTE_PACKED