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-common.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-common.h')
| -rw-r--r-- | cfg-common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cfg-common.h b/cfg-common.h index edffc5fbbd..a3a4dcbee7 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -54,7 +54,7 @@ extern off_t ps_probe; -#ifdef USE_RADIO +#ifdef CONFIG_RADIO const m_option_t radioopts_conf[]={ {"device", &stream_radio_defaults.device, CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"driver", &stream_radio_defaults.driver, CONF_TYPE_STRING, 0, 0 ,0, NULL}, @@ -69,9 +69,9 @@ const m_option_t radioopts_conf[]={ {"achannels", &stream_radio_defaults.achannels, CONF_TYPE_INT, CONF_MIN, 0 ,0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; -#endif /* USE_RADIO */ +#endif /* CONFIG_RADIO */ -#ifdef USE_TV +#ifdef CONFIG_TV const m_option_t tvopts_conf[]={ {"on", "-tv on has been removed, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"immediatemode", &stream_tv_defaults.immediate, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, @@ -137,7 +137,7 @@ const m_option_t tvopts_conf[]={ #endif {NULL, NULL, 0, 0, 0, 0, NULL} }; -#endif /* USE_TV */ +#endif /* CONFIG_TV */ #ifdef HAVE_PVR extern int pvr_param_aspect_ratio; |