summaryrefslogtreecommitdiffstats
path: root/player/main.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-31 19:01:28 +0100
committerwm4 <wm4@nowhere>2014-12-31 19:01:28 +0100
commit282e3202d52a84b868f6972532f10d97ee23c594 (patch)
tree120b272348477b68ccb501e2f1231670e2b1d78a /player/main.c
parentf5b314e9e8685098badaf2bfc8f94422c0f9c4fc (diff)
downloadmpv-282e3202d52a84b868f6972532f10d97ee23c594.tar.bz2
mpv-282e3202d52a84b868f6972532f10d97ee23c594.tar.xz
video: pass some VO params as struct
Not particularly elegant, but better than adding more and more stuff to the relevant function signatures.
Diffstat (limited to 'player/main.c')
-rw-r--r--player/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/player/main.c b/player/main.c
index 7f334d1128..9ecdbc3ed5 100644
--- a/player/main.c
+++ b/player/main.c
@@ -452,9 +452,12 @@ int mp_initialize(struct MPContext *mpctx)
if (opts->force_vo) {
opts->fixed_vo = 1;
- mpctx->video_out = init_best_video_out(mpctx->global, mpctx->input,
- mpctx->osd,
- mpctx->encode_lavc_ctx);
+ struct vo_extra ex = {
+ .input_ctx = mpctx->input,
+ .osd = mpctx->osd,
+ .encode_lavc_ctx = mpctx->encode_lavc_ctx,
+ };
+ mpctx->video_out = init_best_video_out(mpctx->global, &ex);
if (!mpctx->video_out) {
MP_FATAL(mpctx, "Error opening/initializing "
"the selected video_out (-vo) device.\n");