diff options
| author | wm4 <wm4@nowhere> | 2014-06-10 22:48:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-11 00:39:13 +0200 |
| commit | 099cdbf019424b6096aebd45b8ca68bc29068e70 (patch) | |
| tree | e30cfd0d250eb93c4390de94a182ef99943fdf7e /options | |
| parent | fd5207f56d13f70a7750ac457dc5efdb514d9845 (diff) | |
| download | mpv-099cdbf019424b6096aebd45b8ca68bc29068e70.tar.bz2 mpv-099cdbf019424b6096aebd45b8ca68bc29068e70.tar.xz | |
demux_mf: remove global option variables
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 13 | ||||
| -rw-r--r-- | options/options.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/options/options.c b/options/options.c index ef88cab829..b02be333d3 100644 --- a/options/options.c +++ b/options/options.c @@ -67,19 +67,11 @@ extern const struct m_sub_options sws_conf; extern const m_option_t lavfdopts_conf[]; -extern double mf_fps; -extern char * mf_type; extern const struct m_obj_list vf_obj_list; extern const struct m_obj_list af_obj_list; extern const struct m_obj_list vo_obj_list; extern const struct m_obj_list ao_obj_list; -static const m_option_t mfopts_conf[]={ - {"fps", &mf_fps, CONF_TYPE_DOUBLE, 0, 0, 0, NULL}, - {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - #define OPT_BASE_STRUCT struct MPOpts extern const struct m_sub_options image_writer_conf; @@ -222,7 +214,8 @@ const m_option_t mp_opts[] = { OPT_STRING("audio-demuxer", audio_demuxer_name, 0), OPT_STRING("sub-demuxer", sub_demuxer_name, 0), - {"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, + OPT_DOUBLE("mf-fps", mf_fps, 0), + OPT_STRING("mf-type", mf_type, 0), #if HAVE_TV OPT_SUBSTRUCT("tv", tv_params, tv_params_conf, 0), #endif /* HAVE_TV */ @@ -654,6 +647,8 @@ const struct MPOpts mp_default_opts = { .dvd_angle = 1, + .mf_fps = 1.0, + .ad_lavc_param = { .ac3drc = 1., .downmix = 1, diff --git a/options/options.h b/options/options.h index cc57795446..dbddd52c4d 100644 --- a/options/options.h +++ b/options/options.h @@ -253,6 +253,9 @@ typedef struct MPOpts { int bluray_angle; char *bluray_device; + double mf_fps; + char *mf_type; + struct lavc_param { int fast; int show_all; |