mirror of
https://github.com/mpv-player/mpv
synced 2025-03-02 12:20:57 +00:00
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
This commit is contained in:
parent
eb9f86976f
commit
b12e3f188f
@ -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 \
|
||||
|
@ -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.
|
||||
|
@ -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) */
|
||||
|
Loading…
Reference in New Issue
Block a user