From 1dff26730aeb915fae99dc7eb38c864af41f70c9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 21 May 2013 00:45:42 +0200
Subject: dec_video: get rid of two global variables

---
 core/cfg-mplayer.h | 6 +++---
 core/defaultopts.c | 1 +
 core/options.h     | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 52c1e4891c..1c078fac25 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -448,7 +448,7 @@ const m_option_t common_opts[] = {
     OPT_STRING("hwdec-codecs", hwdec_codecs, 0),
 
     // postprocessing:
-    {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
+    OPT_INT("pp", divx_quality, 0),
 #ifdef CONFIG_LIBPOSTPROC
     {"pphelp", (void *) &pp_help, CONF_TYPE_PRINT, CONF_GLOBAL | CONF_NOCFG, 0, 0, NULL},
 #endif
@@ -463,8 +463,8 @@ const m_option_t common_opts[] = {
 
     // use (probably completely broken) decoder direct rendering
     OPT_FLAG("dr1", vd_use_dr1, 0),
-    {"field-dominance", &field_dominance, CONF_TYPE_CHOICE, 0,
-     M_CHOICES(({"auto", -1}, {"top", 0}, {"bottom", 1}))},
+    OPT_CHOICE("field-dominance", field_dominance, 0,
+               ({"auto", -1}, {"top", 0}, {"bottom", 1})),
 
     {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
     {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
diff --git a/core/defaultopts.c b/core/defaultopts.c
index c07580a872..28eb9bcbb1 100644
--- a/core/defaultopts.c
+++ b/core/defaultopts.c
@@ -78,6 +78,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
         .audio_output_format = -1,  // AF_FORMAT_UNKNOWN
         .playback_speed = 1.,
         .movie_aspect = -1.,
+        .field_dominance = -1,
         .sub_auto = 1,
         .osd_bar_visible = 1,
 #ifdef CONFIG_ASS
diff --git a/core/options.h b/core/options.h
index 34254d69aa..ffc98633e3 100644
--- a/core/options.h
+++ b/core/options.h
@@ -165,6 +165,8 @@ typedef struct MPOpts {
     struct m_obj_settings *vf_settings;
     float movie_aspect;
     int flip;
+    int field_dominance;
+    int divx_quality;
     int vd_use_dr1;
     char **sub_name;
     char **sub_paths;
-- 
cgit v1.2.3