diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /cfg-mplayer.h | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index e1806ca1e0..a4350eefee 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -53,7 +53,7 @@ const m_option_t vd_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -#ifdef USE_TV +#ifdef CONFIG_TV const m_option_t tvscan_conf[]={ {"autostart", &stream_tv_defaults.scan, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"threshold", &stream_tv_defaults.scan_threshold, CONF_TYPE_INT, CONF_RANGE, 1, 100, NULL}, @@ -249,13 +249,13 @@ const m_option_t mplayer_opts[]={ {"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#ifdef USE_FRIBIDI +#ifdef CONFIG_FRIBIDI {"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"menu-noflip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"menu-flip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"menu-noflip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif /* USE_FRIBIDI */ +#endif /* CONFIG_FRIBIDI */ #else {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL}, #endif /* HAVE_MENU */ @@ -263,7 +263,7 @@ const m_option_t mplayer_opts[]={ // these should be moved to -common, and supported in MEncoder {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, -#ifdef USE_UNRAR_EXEC +#ifdef CONFIG_UNRAR_EXEC {"unrarexec", &unrar_executable, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif @@ -338,11 +338,11 @@ const m_option_t mplayer_opts[]={ {"mouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nomouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, OPT_INTRANGE("doubleclick-time", doubleclick_time, 0, 0, 1000), -#ifdef USE_TV +#ifdef CONFIG_TV {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #else {"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -#endif /* USE_TV */ +#endif /* CONFIG_TV */ #include "cfg-common-opts.h" |