Mercurial > mplayer.hg

diff cfg-common.h @ 22998:85343b921fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author diego
date Wed, 18 Apr 2007 09:56:24 +0000
parents e8026449a338
children 499526183645
line wrap: on
line diff
--- a/cfg-common.h	Wed Apr 18 09:27:59 2007 +0000
+++ b/cfg-common.h	Wed Apr 18 09:56:24 2007 +0000
@@ -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 @@
 
 #endif
 
-#if defined(USE_DVDREAD) || defined(USE_DVDNAV)
+#ifdef USE_DVDREAD
 extern int dvd_speed; /* stream/stream_dvd.c */
 #endif