diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-12 15:03:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-12 15:03:34 +0300 |
| commit | e09fe1ce0413609b891f4abf2f5df5f1996622a0 (patch) | |
| tree | 4624712ba8f4773463272c44513a86af6accc9da /cfg-common.h | |
| parent | 9425571f41d5cca40ec75537cdac3e474948f047 (diff) | |
| parent | f88bf0c7b7faf4b6f58c8b4c9c0f3892e07dc5ba (diff) | |
| download | mpv-e09fe1ce0413609b891f4abf2f5df5f1996622a0.tar.bz2 mpv-e09fe1ce0413609b891f4abf2f5df5f1996622a0.tar.xz | |
Merge svn changes up to r27458
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cfg-common.h b/cfg-common.h index 2b0122c353..607333a52d 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -139,7 +139,6 @@ const m_option_t tvopts_conf[]={ }; #endif /* CONFIG_TV */ -#ifdef CONFIG_PVR extern int pvr_param_aspect_ratio; extern int pvr_param_sample_rate; extern int pvr_param_audio_layer; @@ -150,6 +149,7 @@ extern char *pvr_param_bitrate_mode; extern int pvr_param_bitrate_peak; extern char *pvr_param_stream_type; +#ifdef CONFIG_PVR const m_option_t pvropts_conf[]={ {"aspect", &pvr_param_aspect_ratio, CONF_TYPE_INT, 0, 1, 4, NULL}, {"arate", &pvr_param_sample_rate, CONF_TYPE_INT, 0, 32000, 48000, NULL}, @@ -164,11 +164,7 @@ const m_option_t pvropts_conf[]={ }; #endif /* CONFIG_PVR */ -#ifdef CONFIG_DVBIN -#include "stream/dvbin.h" extern const m_config_t dvbin_opts_conf[]; -#endif - extern const m_option_t lavfdopts_conf[]; extern int rtspStreamOverTCP; @@ -346,10 +342,9 @@ const m_option_t msgl_config[]={ }; -#ifdef WIN32 - extern char * proc_priority; +#ifdef WIN32 struct { char* name; int prio; |