Mercurial > mplayer.hg
changeset 31419:8abdc84493f3
Move pvr_ extern variable declarations to stream/pvr.h.
| author | diego |
|---|---|
| date | Sun, 20 Jun 2010 15:15:37 +0000 |
| parents | d2fd0e4d0b9a |
| children | 6325ecce171d |
| files | cfg-common.h stream/pvr.h |
| diffstat | 2 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sun Jun 20 15:04:12 2010 +0000 +++ b/cfg-common.h Sun Jun 20 15:15:37 2010 +0000 @@ -38,6 +38,7 @@ #include "libpostproc/postprocess.h" #include "osdep/priority.h" #include "stream/network.h" +#include "stream/pvr.h" #include "stream/stream_dvd_common.h" #include "codec-cfg.h" @@ -141,16 +142,6 @@ }; #endif /* CONFIG_TV */ -extern int pvr_param_aspect_ratio; -extern int pvr_param_sample_rate; -extern int pvr_param_audio_layer; -extern int pvr_param_audio_bitrate; -extern char *pvr_param_audio_mode; -extern int pvr_param_bitrate; -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},
--- a/stream/pvr.h Sun Jun 20 15:04:12 2010 +0000 +++ b/stream/pvr.h Sun Jun 20 15:15:37 2010 +0000 @@ -30,6 +30,17 @@ #include "stream.h" #include "tv.h" +extern char *pvr_param_audio_mode; +extern char *pvr_param_bitrate_mode; +extern char *pvr_param_stream_type; + +extern int pvr_param_aspect_ratio; +extern int pvr_param_audio_bitrate; +extern int pvr_param_audio_layer; +extern int pvr_param_bitrate; +extern int pvr_param_bitrate_peak; +extern int pvr_param_sample_rate; + /** * @brief Get the current station name. * The pointer is valid, till the stream is closed.