diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 23:08:41 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 23:08:41 +0000 |
| commit | b12e3f188f83e0a1bee498cc1478741595032163 (patch) | |
| tree | a66ec3763a95960b41d96ca10c6cc8068c3b4919 /libdvdread | |
| parent | eb9f86976f4b6ab65a45711bfb417cdd09863ab0 (diff) | |
| download | mpv-b12e3f188f83e0a1bee498cc1478741595032163.tar.bz2 mpv-b12e3f188f83e0a1bee498cc1478741595032163.tar.xz | |
Revert nonsensical local change hunk that had no effect at all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20803 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdvdread')
| -rw-r--r-- | libdvdread/Makefile | 2 | ||||
| -rw-r--r-- | libdvdread/dvd_reader.c | 7 | ||||
| -rw-r--r-- | libdvdread/libdvdread_changes.diff | 14 |
3 files changed, 0 insertions, 23 deletions
diff --git a/libdvdread/Makefile b/libdvdread/Makefile index 866dd2fedb..2fc59fc1db 100644 --- a/libdvdread/Makefile +++ b/libdvdread/Makefile @@ -20,8 +20,6 @@ LIB=libdvdread ifeq ($(OPTFLAGS),) OPTFLAGS = -mcpu=pentium -march=pentium -O4 -else -OPTFLAGS += -DHAVE_MPLAYER endif CFLAGS= -I../libdvdcss -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \ diff --git a/libdvdread/dvd_reader.c b/libdvdread/dvd_reader.c index 996477ef2c..d944696c15 100644 --- a/libdvdread/dvd_reader.c +++ b/libdvdread/dvd_reader.c @@ -210,13 +210,6 @@ static int initAllCSSKeys( dvd_reader_t *dvd ) } -#ifndef HAVE_MPLAYER - #include "get_path.c" -#else - extern char * get_path( const char * filename ); -#endif - -//extern char * dvdcss_cache_dir; /** * Open a DVD image or block device file. diff --git a/libdvdread/libdvdread_changes.diff b/libdvdread/libdvdread_changes.diff index 741e9cb05b..dfbf7abbc0 100644 --- a/libdvdread/libdvdread_changes.diff +++ b/libdvdread/libdvdread_changes.diff @@ -155,20 +155,6 @@ diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c struct dvd_reader_s { /* Basic information. */ -@@ -194,6 +210,13 @@ - } - - -+#ifndef HAVE_MPLAYER -+ #include "get_path.c" -+#else -+ extern char * get_path( const char * filename ); -+#endif -+ -+//extern char * dvdcss_cache_dir; - - /** - * Open a DVD image or block device file. @@ -278,11 +301,16 @@ Darwin /dev/rdisk0, it needs to be the raw device BSD/OS /dev/sr0c (if not mounted) or /dev/rsr0c ('c' any letter will do) */ |