[MPlayer-cvslog] r23016 - trunk/cfg-common.h

[diego]

Author: diego
Date: Wed Apr 18 11:56:24 2007
New Revision: 23016

Modified:
   trunk/cfg-common.h

Log:
Fix preprocessor conditionals: libdvdnav includes libdvdread and configure
enables libdvdread support if libdvdnav is found. There is no need to check
separately in the source with the preprocessor.


Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	(original)
+++ trunk/cfg-common.h	Wed Apr 18 11:56:24 2007
@@ -27,7 +27,7 @@
 	{"vcd", "-vcd N has been removed, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
 	{"cuefile", "-cuefile has been removed, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#if defined(USE_DVDREAD) || defined(USE_DVDNAV)
+#ifdef USE_DVDREAD
 	{"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
 	{"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
 #else
@@ -374,7 +374,7 @@ extern int reuse_socket;
 
 #endif
 
-#if defined(USE_DVDREAD) || defined(USE_DVDNAV)
+#ifdef USE_DVDREAD
 extern int dvd_speed; /* stream/stream_dvd.c */
 #endif