[MPlayer-cvslog] r20803 - in trunk/libdvdread: Makefile dvd_reader.c libdvdread_changes.diff

[diego]

Author: diego
Date: Thu Nov  9 00:08:41 2006
New Revision: 20803

Modified:
   trunk/libdvdread/Makefile
   trunk/libdvdread/dvd_reader.c
   trunk/libdvdread/libdvdread_changes.diff

Log:
Revert nonsensical local change hunk that had no effect at all.


Modified: trunk/libdvdread/Makefile
==============================================================================
--- trunk/libdvdread/Makefile	(original)
+++ trunk/libdvdread/Makefile	Thu Nov  9 00:08:41 2006
@@ -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 \

Modified: trunk/libdvdread/dvd_reader.c
==============================================================================
--- trunk/libdvdread/dvd_reader.c	(original)
+++ trunk/libdvdread/dvd_reader.c	Thu Nov  9 00:08:41 2006
@@ -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.

Modified: trunk/libdvdread/libdvdread_changes.diff
==============================================================================
--- trunk/libdvdread/libdvdread_changes.diff	(original)
+++ trunk/libdvdread/libdvdread_changes.diff	Thu Nov  9 00:08:41 2006
@@ -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) */