diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-18 09:58:04 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-18 09:58:04 +0000 |
| commit | 1ac1a875e6eca228dca9d18e5e756fb59f21e0a8 (patch) | |
| tree | eada20e391a6ac79494690828bee566de742e389 /cfg-common.h | |
| parent | 4092da4dc06990ea4cf578703a81457866724f8e (diff) | |
| download | mpv-1ac1a875e6eca228dca9d18e5e756fb59f21e0a8.tar.bz2 mpv-1ac1a875e6eca228dca9d18e5e756fb59f21e0a8.tar.xz | |
Merge both USE_DVDREAD sections.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23017 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cfg-common.h b/cfg-common.h index 2a1851dd6d..7bb1c903d7 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -30,15 +30,12 @@ #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 - {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -#endif -#ifdef USE_DVDREAD {"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, #else + {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, |