summaryrefslogtreecommitdiffstats
path: root/player/configfiles.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-11 02:04:02 +0200
committerwm4 <wm4@nowhere>2014-06-11 02:05:07 +0200
commit8f60de98beef61c3631819a4e3a4be1ec56da00d (patch)
tree5ece4d50399b6799eaaa7db53379e7a3aa8983c3 /player/configfiles.c
parentbe5725ebc4813f9d5c582fd0f30fe1ebc661e3e1 (diff)
downloadmpv-8f60de98beef61c3631819a4e3a4be1ec56da00d.tar.bz2
mpv-8f60de98beef61c3631819a4e3a4be1ec56da00d.tar.xz
encode: make option struct local
Similar to previous commits.
Diffstat (limited to 'player/configfiles.c')
-rw-r--r--player/configfiles.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/configfiles.c b/player/configfiles.c
index 9b20f5af71..2794ddaebf 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -32,6 +32,7 @@
#include "osdep/io.h"
#include "common/global.h"
+#include "common/encode.h"
#include "common/msg.h"
#include "options/path.h"
#include "options/m_config.h"
@@ -58,7 +59,8 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx)
bool r = true;
char *conffile;
char *section = NULL;
- bool encoding = opts->encode_output.file && *opts->encode_output.file;
+ bool encoding = opts->encode_opts &&
+ opts->encode_opts->file && opts->encode_opts->file[0];
// In encoding mode, we don't want to apply normal config options.
// So we "divert" normal options into a separate section, and the diverted
// section is never used - unless maybe it's explicitly referenced from an