diff options
| author | wm4 <wm4@nowhere> | 2013-06-07 22:31:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-08 17:08:20 +0200 |
| commit | 757c6d03940bd32fcadbb09deaa45d6c3e09059d (patch) | |
| tree | b8afa63ae18f9e3fc76e36c8f106a02a1dd7fc6a /core/mplayer.c | |
| parent | c185b0ba4a09eab1bf969e40acc660454921f460 (diff) | |
| download | mpv-757c6d03940bd32fcadbb09deaa45d6c3e09059d.tar.bz2 mpv-757c6d03940bd32fcadbb09deaa45d6c3e09059d.tar.xz | |
core: merge defaultopts.c into cfg-mplayer.h
There isn't really any reason why this should be in a separate source
file.
Diffstat (limited to 'core/mplayer.c')
| -rw-r--r-- | core/mplayer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index baae55b581..ea3b053f40 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -151,7 +151,6 @@ #include "core/mp_core.h" #include "core/options.h" -#include "core/defaultopts.h" static const char help_text[] = _( "Usage: mpv [options] [url|path/]filename\n" @@ -4629,6 +4628,7 @@ static int mpv_main(int argc, char *argv[]) struct MPContext *mpctx = talloc(NULL, MPContext); *mpctx = (struct MPContext){ + .opts = mp_default_opts, .last_dvb_step = 1, .terminal_osd_text = talloc_strdup(mpctx, ""), .playlist = talloc_struct(mpctx, struct playlist, {0}), @@ -4639,7 +4639,6 @@ static int mpv_main(int argc, char *argv[]) screenshot_init(mpctx); struct MPOpts *opts = &mpctx->opts; - set_default_mplayer_options(opts); // Create the config context and register the options mpctx->mconfig = m_config_new(opts, cfg_include); m_config_register_options(mpctx->mconfig, mplayer_opts); |