diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 10:44:59 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 10:44:59 +0300 |
commit | fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 (patch) | |
tree | 9e1eb90e7ec461afd59c3411c2be253b75a9f448 /mencoder.c | |
parent | 6be229cbbfbe29ad61025051b1d903f5619e0b8a (diff) | |
download | mpv-fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3.tar.bz2 mpv-fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3.tar.xz |
Move global mconfig to mpctx
The global was used in the function cfg_include which handles the
-include option. Make the address available in that function by
creating a new dynamically allocated option in m_config_new that has
the address in the option's private data.
asxparser.c also used the global. Making it available through all ways
the code could get called required a number of relatively straightforward
changes to playtree and menu code.
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 54dc1c0776..6767000501 100644 --- a/mencoder.c +++ b/mencoder.c @@ -419,7 +419,7 @@ audio_encoder_t *aencoder = NULL; // Create the config context and register the options set_default_mencoder_options(&opts); - mconfig = m_config_new(&opts); + mconfig = m_config_new(&opts, cfg_include); m_config_register_options(mconfig,mencoder_opts); // Preparse the command line |