Mercurial > mplayer.hg
changeset 20787:11731a2cbc11
Revert nonsensical local change hunk that had no effect at all.
| author | diego |
|---|---|
| date | Wed, 08 Nov 2006 23:08:41 +0000 |
| parents | 50b5a9e01009 |
| children | 3a0ffbc3b7a7 |
| files | libdvdread/Makefile libdvdread/dvd_reader.c libdvdread/libdvdread_changes.diff |
| diffstat | 3 files changed, 0 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libdvdread/Makefile Wed Nov 08 23:05:33 2006 +0000 +++ b/libdvdread/Makefile Wed Nov 08 23:08:41 2006 +0000 @@ -20,8 +20,6 @@ ifeq ($(OPTFLAGS),) OPTFLAGS = -mcpu=pentium -march=pentium -O4 -else -OPTFLAGS += -DHAVE_MPLAYER endif CFLAGS= -I../libdvdcss -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
--- a/libdvdread/dvd_reader.c Wed Nov 08 23:05:33 2006 +0000 +++ b/libdvdread/dvd_reader.c Wed Nov 08 23:08:41 2006 +0000 @@ -210,13 +210,6 @@ } -#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.
--- a/libdvdread/libdvdread_changes.diff Wed Nov 08 23:05:33 2006 +0000 +++ b/libdvdread/libdvdread_changes.diff Wed Nov 08 23:08:41 2006 +0000 @@ -155,20 +155,6 @@ 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) */