summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-11 01:35:39 +0200
committerwm4 <wm4@nowhere>2014-06-11 01:36:11 +0200
commit14983eb37d5aea4db27f62b2d72293318387424f (patch)
treec4afa51b20bcaa52590c3162f46cd8fd51664aa5 /options
parenta7ed3610ca8f688a1be7d003df157163eebbf615 (diff)
downloadmpv-14983eb37d5aea4db27f62b2d72293318387424f.tar.bz2
mpv-14983eb37d5aea4db27f62b2d72293318387424f.tar.xz
vd_lavc: make option struct local
Removes specifics from options.h and options.c, and puts everything into vd_lavc.c.
Diffstat (limited to 'options')
-rw-r--r--options/options.c8
-rw-r--r--options/options.h12
2 files changed, 3 insertions, 17 deletions
diff --git a/options/options.c b/options/options.c
index c9a3a59203..e10ac8d69c 100644
--- a/options/options.c
+++ b/options/options.c
@@ -62,6 +62,7 @@ extern const struct m_sub_options stream_dvb_conf;
extern const struct m_sub_options sws_conf;
extern const struct m_sub_options demux_rawaudio_conf;
extern const struct m_sub_options demux_rawvideo_conf;
+extern const struct m_sub_options vd_lavc_conf;
extern const m_option_t lavfdopts_conf[];
@@ -80,7 +81,6 @@ static const m_option_t screenshot_conf[] = {
{0},
};
-extern const m_option_t lavc_decode_opts_conf[];
extern const m_option_t ad_lavc_decode_opts_conf[];
extern const m_option_t mp_input_opts[];
@@ -277,7 +277,7 @@ const m_option_t mp_opts[] = {
OPT_CHOICE("field-dominance", field_dominance, 0,
({"auto", -1}, {"top", 0}, {"bottom", 1})),
- {"vd-lavc", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG},
+ OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0),
{"ad-lavc", (void *) ad_lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG},
{"demuxer-lavf", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG},
@@ -655,10 +655,6 @@ const struct MPOpts mp_default_opts = {
.lavfdopts = {
.allow_mimetype = 1,
},
- .lavc_param = {
- .show_all = 0,
- .check_hw_profile = 1,
- },
.input = {
.key_fifo_size = 7,
.doubleclick_time = 300,
diff --git a/options/options.h b/options/options.h
index 6aed93f8c7..6bf7a2bf2b 100644
--- a/options/options.h
+++ b/options/options.h
@@ -259,17 +259,7 @@ typedef struct MPOpts {
struct demux_rawaudio_opts *demux_rawaudio;
struct demux_rawvideo_opts *demux_rawvideo;
- struct lavc_param {
- int fast;
- int show_all;
- char *skip_loop_filter_str;
- char *skip_idct_str;
- char *skip_frame_str;
- int threads;
- int bitexact;
- int check_hw_profile;
- char *avopt;
- } lavc_param;
+ struct vd_lavc_params *vd_lavc_params;
struct ad_lavc_param {
float ac3drc;