diff options
author | wm4 <wm4@nowhere> | 2013-10-24 22:20:16 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-10-24 22:50:13 +0200 |
commit | 60aea74f4483661e34b12571add07f8e5e136660 (patch) | |
tree | c1b0c94cbb926785cec0e56d7bd50fa18e9f4457 /mpvcore/mplayer.c | |
parent | f6bceacaff0d2e1a1265d29372fcf7b34c57446c (diff) | |
download | mpv-60aea74f4483661e34b12571add07f8e5e136660.tar.bz2 mpv-60aea74f4483661e34b12571add07f8e5e136660.tar.xz |
m_config: refactor option defaults handling
Keep track of the default values directly, instead of creating a new
instance of the option struct just to get the defaults.
Also get rid of the special handling of m_obj_desc.init_options.
Instead, handle it purely by the option parser. Originally, I wanted to
handle --vo=opengl-hq and --vo=direct3d_shaders with this (by making
them aliases to the real VOs with a different preset), but since --vo
=opengl-hq=help prints the wrong values (as consequence of the
simplification), I'm not doing that, and instead use something
different.
Diffstat (limited to 'mpvcore/mplayer.c')
-rw-r--r-- | mpvcore/mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index bfc5f7c4e1..f05fcd9795 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -4930,7 +4930,7 @@ static int mpv_main(int argc, char *argv[]) // Create the config context and register the options mpctx->mconfig = m_config_new(mpctx, sizeof(struct MPOpts), - &mp_default_opts, mp_opts, NULL); + &mp_default_opts, mp_opts); mpctx->opts = mpctx->mconfig->optstruct; mpctx->mconfig->includefunc = cfg_include; mpctx->mconfig->use_profiles = true; |