summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-10 21:44:50 +0200
committerwm4 <wm4@nowhere>2014-06-11 00:35:03 +0200
commit959b718957527710b4bcf6e7227a0beaeb034137 (patch)
tree8007a8206751650370ffbadb09c1527664f333a5 /options
parent77a7aa2c41d4d4be2eb2ad099b201d3fdd8f3cc7 (diff)
downloadmpv-959b718957527710b4bcf6e7227a0beaeb034137.tar.bz2
mpv-959b718957527710b4bcf6e7227a0beaeb034137.tar.xz
stream_dvb: remove global option variables
Diffstat (limited to 'options')
-rw-r--r--options/options.c4
-rw-r--r--options/options.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c
index 509a408537..12057c6e9a 100644
--- a/options/options.c
+++ b/options/options.c
@@ -64,8 +64,8 @@ static void print_help(struct mp_log *log)
extern const struct m_sub_options tv_params_conf;
extern const struct m_sub_options stream_pvr_conf;
extern const struct m_sub_options stream_cdda_conf;
+extern const struct m_sub_options stream_dvb_conf;
-extern const m_option_t dvbin_opts_conf[];
extern const m_option_t lavfdopts_conf[];
extern int sws_chr_vshift;
@@ -248,7 +248,7 @@ const m_option_t mp_opts[] = {
OPT_SUBSTRUCT("pvr", stream_pvr_opts, stream_pvr_conf, 0),
#endif /* HAVE_PVR */
#if HAVE_DVBIN
- {"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ OPT_SUBSTRUCT("dvbin", stream_dvb_opts, stream_dvb_conf, 0),
#endif
// ------------------------- a-v sync options --------------------
diff --git a/options/options.h b/options/options.h
index 09567db064..229361f767 100644
--- a/options/options.h
+++ b/options/options.h
@@ -241,6 +241,7 @@ typedef struct MPOpts {
struct tv_params *tv_params;
struct pvr_params *stream_pvr_opts;
struct cdda_params *stream_cdda_opts;
+ struct dvb_params *stream_dvb_opts;
char *cdrom_device;