diff options
| author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 22:41:27 +0100 |
|---|---|---|
| committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 23:32:47 +0100 |
| commit | 1198c031e4233a0cff5aa7d24aab986163f6903a (patch) | |
| tree | bff49197908452f3ad1363edcf4c527db9bf1fe0 /core/mplayer.c | |
| parent | 4949992264d78d6dd22c0f6c611850402fd6eb30 (diff) | |
| download | mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.bz2 mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.xz | |
vo: Separate vo options from MPOpts
Separate the video output options from the big MPOpts structure and also only
pass the new mp_vo_opts structure to the vo backend.
Move video_driver_list into mp_vo_opts
Diffstat (limited to 'core/mplayer.c')
| -rw-r--r-- | core/mplayer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index d217f98932..041b7da67b 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -2359,7 +2359,7 @@ int reinit_video_chain(struct MPContext *mpctx) //================== Init VIDEO (codec & libvo) ========================== if (!opts->fixed_vo || !(mpctx->initialized_flags & INITIALIZED_VO)) { mpctx->video_out - = init_best_video_out(opts, mpctx->key_fifo, mpctx->input, + = init_best_video_out(&opts->vo, mpctx->key_fifo, mpctx->input, mpctx->encode_lavc_ctx); if (!mpctx->video_out) { mp_tmsg(MSGT_CPLAYER, MSGL_FATAL, "Error opening/initializing " @@ -3850,9 +3850,9 @@ static void play_current_file(struct MPContext *mpctx) load_per_extension_config(mpctx->mconfig, mpctx->filename); load_per_file_config(mpctx->mconfig, mpctx->filename); - if (opts->video_driver_list) + if (opts->vo.video_driver_list) load_per_output_config(mpctx->mconfig, PROFILE_CFG_VO, - opts->video_driver_list[0]); + opts->vo.video_driver_list[0]); if (opts->audio_driver_list) load_per_output_config(mpctx->mconfig, PROFILE_CFG_AO, opts->audio_driver_list[0]); @@ -4242,8 +4242,8 @@ static bool handle_help_options(struct MPContext *mpctx) { struct MPOpts *opts = &mpctx->opts; int opt_exit = 0; - if (opts->video_driver_list && - strcmp(opts->video_driver_list[0], "help") == 0) { + if (opts->vo.video_driver_list && + strcmp(opts->vo.video_driver_list[0], "help") == 0) { list_video_out(); opt_exit = 1; } |