github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Code Releases Activity

Drop some unnecessary local changes.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20999 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-18 00:45:16 +00:00
parent b8aba3e44a
commit 9b9c70ce7d
8 changed files with 9 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dvdread/dvd_input.c
View File

@ -41,7 +41,7 @@ char * (*dvdinput_error) (dvd_input_t);
#ifdef HAVE_DVDCSS_DVDCSS_H #ifdef HAVE_DVDCSS_DVDCSS_H
/* linking to libdvdcss */ /* linking to libdvdcss */
#include "dvdcss/dvdcss.h" #include <dvdcss/dvdcss.h>
#define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_open(a) dvdcss_open((char*)(a))
#define DVDcss_close dvdcss_close #define DVDcss_close dvdcss_close
#define DVDcss_seek dvdcss_seek #define DVDcss_seek dvdcss_seek

8
dvdread/ifo_print.h
View File

@ -5,10 +5,6 @@
* Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>, * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
* Håkan Hjort <d95hjort@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 * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * 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 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "ifo_types.h" #include <dvdread/ifo_types.h>
#include "dvd_reader.h" #include <dvdread/dvd_reader.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
dvdread/ifo_read.h
View File

@ -5,10 +5,6 @@
* Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>, * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn@dtek.chalmers.se>,
* Håkan Hjort <d95hjort@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 * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * 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 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "ifo_types.h" #include <dvdread/ifo_types.h>
#include "dvd_reader.h" #include <dvdread/dvd_reader.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
dvdread/ifo_types.h
View File

@ -25,7 +25,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "dvd_reader.h" #include <dvdread/dvd_reader.h>
#undef ATTRIBUTE_PACKED #undef ATTRIBUTE_PACKED

84
dvdread/libdvdread_changes.diff
View File

@ -64,15 +64,6 @@ diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore
diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c 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.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/dvd_input.c 2005-06-23 00:30:23.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 @@ @@ -74,7 +78,7 @@
dvd_input_t dev; dvd_input_t dev;
@ -306,20 +297,6 @@ diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c
i, pgc->subp_control[i]); 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 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.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 +++ 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; 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 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.orig/ifo_types.h 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/ifo_types.h 2005-06-23 00:19:10.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 @@ @@ -394,6 +398,55 @@
} ATTRIBUTE_PACKED user_ops_t; } 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 next_pgc_nr;
uint16_t prev_pgc_nr; uint16_t prev_pgc_nr;
uint16_t goup_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

6
dvdread/nav_print.h
View File

@ -5,10 +5,6 @@
* Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>, * Copyright (C) 2001, 2002 Billy Biggs <vektor@dumbterm.net>,
* Håkan Hjort <d95hjort@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 * 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 * 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 * 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 * 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. * Pretty printing of the NAV packets, PCI and DSI structs.

6
dvdread/nav_read.h
View File

@ -4,10 +4,6 @@
/* /*
* Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se>. * 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 * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * 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 * 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. * Parsing of NAV data, PCI and DSI parts.

6
dvdread/nav_types.h
View File

@ -4,10 +4,6 @@
/* /*
* Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort@dtek.chalmers.se> * 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 * The data structures in this file should represent the layout of the
* pci and dsi packets as they are stored in the stream. Information * 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 * found by reading the source to VOBDUMP is the base for the structure
@ -34,7 +30,7 @@
*/ */
#include <inttypes.h> #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 #undef ATTRIBUTE_PACKED