[MPlayer-cvslog] r20999 - in trunk/dvdread: dvd_input.c ifo_print.h ifo_read.h ifo_types.h libdvdread_changes.diff nav_print.h nav_read.h nav_types.h
diego
subversion at mplayerhq.hu
Sat Nov 18 01:45:16 CET 2006
Author: diego
Date: Sat Nov 18 01:45:16 2006
New Revision: 20999
Modified:
trunk/dvdread/dvd_input.c
trunk/dvdread/ifo_print.h
trunk/dvdread/ifo_read.h
trunk/dvdread/ifo_types.h
trunk/dvdread/libdvdread_changes.diff
trunk/dvdread/nav_print.h
trunk/dvdread/nav_read.h
trunk/dvdread/nav_types.h
Log:
Drop some unnecessary local changes.
Modified: trunk/dvdread/dvd_input.c
==============================================================================
--- trunk/dvdread/dvd_input.c (original)
+++ trunk/dvdread/dvd_input.c Sat Nov 18 01:45:16 2006
@@ -41,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
Modified: trunk/dvdread/ifo_print.h
==============================================================================
--- trunk/dvdread/ifo_print.h (original)
+++ trunk/dvdread/ifo_print.h Sat Nov 18 01:45:16 2006
@@ -5,10 +5,6 @@
* Copyright (C) 2000, 2001 Björn Englund <d4bjorn at dtek.chalmers.se>,
* Håkan Hjort <d95hjort at 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" {
Modified: trunk/dvdread/ifo_read.h
==============================================================================
--- trunk/dvdread/ifo_read.h (original)
+++ trunk/dvdread/ifo_read.h Sat Nov 18 01:45:16 2006
@@ -5,10 +5,6 @@
* Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn at dtek.chalmers.se>,
* Håkan Hjort <d95hjort at 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" {
Modified: trunk/dvdread/ifo_types.h
==============================================================================
--- trunk/dvdread/ifo_types.h (original)
+++ trunk/dvdread/ifo_types.h Sat Nov 18 01:45:16 2006
@@ -25,7 +25,7 @@
*/
#include <inttypes.h>
-#include "dvd_reader.h"
+#include <dvdread/dvd_reader.h>
#undef ATTRIBUTE_PACKED
Modified: trunk/dvdread/libdvdread_changes.diff
==============================================================================
--- trunk/dvdread/libdvdread_changes.diff (original)
+++ trunk/dvdread/libdvdread_changes.diff Sat Nov 18 01:45:16 2006
@@ -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 <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 @@
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 @@
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 @@
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
Modified: trunk/dvdread/nav_print.h
==============================================================================
--- trunk/dvdread/nav_print.h (original)
+++ trunk/dvdread/nav_print.h Sat Nov 18 01:45:16 2006
@@ -5,10 +5,6 @@
* Copyright (C) 2001, 2002 Billy Biggs <vektor at dumbterm.net>,
* Håkan Hjort <d95hjort at 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.
Modified: trunk/dvdread/nav_read.h
==============================================================================
--- trunk/dvdread/nav_read.h (original)
+++ trunk/dvdread/nav_read.h Sat Nov 18 01:45:16 2006
@@ -4,10 +4,6 @@
/*
* Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort at 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.
Modified: trunk/dvdread/nav_types.h
==============================================================================
--- trunk/dvdread/nav_types.h (original)
+++ trunk/dvdread/nav_types.h Sat Nov 18 01:45:16 2006
@@ -4,10 +4,6 @@
/*
* Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort at 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
More information about the MPlayer-cvslog
mailing list