From 959b718957527710b4bcf6e7227a0beaeb034137 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 Jun 2014 21:44:50 +0200
Subject: stream_dvb: remove global option variables

---
 options/options.c | 4 ++--
 options/options.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'options')

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;
 
-- 
cgit v1.2.3