summaryrefslogtreecommitdiffstats
path: root/player/main.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/main.c
parentbe5725ebc4813f9d5c582fd0f30fe1ebc661e3e1 (diff)
downloadmpv-8f60de98beef61c3631819a4e3a4be1ec56da00d.tar.bz2
mpv-8f60de98beef61c3631819a4e3a4be1ec56da00d.tar.xz
encode: make option struct local
Similar to previous commits.
Diffstat (limited to 'player/main.c')
-rw-r--r--player/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/player/main.c b/player/main.c
index 19c24c036b..e2672a744e 100644
--- a/player/main.c
+++ b/player/main.c
@@ -236,7 +236,7 @@ static bool handle_help_options(struct MPContext *mpctx)
opt_exit = 1;
}
#if HAVE_ENCODING
- if (encode_lavc_showhelp(log, &opts->encode_output))
+ if (encode_lavc_showhelp(log, opts->encode_opts))
opt_exit = 1;
#endif
return opt_exit;
@@ -383,8 +383,8 @@ int mp_initialize(struct MPContext *mpctx)
mp_dispatch_set_wakeup_fn(mpctx->dispatch, wakeup_playloop, mpctx);
#if HAVE_ENCODING
- if (opts->encode_output.file && *opts->encode_output.file) {
- mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output,
+ if (opts->encode_opts->file && opts->encode_opts->file[0]) {
+ mpctx->encode_lavc_ctx = encode_lavc_init(opts->encode_opts,
mpctx->global);
if(!mpctx->encode_lavc_ctx) {
MP_INFO(mpctx, "Encoding initialization failed.");