summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index f12560b589..567e38e285 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4333,13 +4333,6 @@ goto_reopen_demuxer: ;
mpctx->sh_video->fps, mpctx->sh_video->frametime);
}
- mp_input_set_section(mpctx->input, NULL, 0);
- //TODO: add desired (stream-based) sections here
- if (mpctx->master_demuxer->type == DEMUXER_TYPE_TV)
- mp_input_set_section(mpctx->input, "tv", 0);
- if (mpctx->encode_lavc_ctx)
- mp_input_set_section(mpctx->input, "encode", MP_INPUT_NO_DEFAULT_SECTION);
-
//==================== START PLAYING =======================
if (!mpctx->sh_video && !mpctx->sh_audio) {
@@ -4702,6 +4695,8 @@ static int mpv_main(int argc, char *argv[])
set_priority();
#endif
+ init_input(mpctx);
+
#ifdef CONFIG_ENCODING
if (opts->encode_output.file && *opts->encode_output.file) {
mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output);
@@ -4713,6 +4708,7 @@ static int mpv_main(int argc, char *argv[])
m_config_set_option0(mpctx->mconfig, "ao", "lavc");
m_config_set_option0(mpctx->mconfig, "fixed-vo", "yes");
m_config_set_option0(mpctx->mconfig, "gapless-audio", "yes");
+ mp_input_enable_section(mpctx->input, "encode", MP_INPUT_EXCLUSIVE);
}
#endif
@@ -4722,8 +4718,6 @@ static int mpv_main(int argc, char *argv[])
mpctx->osd = osd_create(opts, mpctx->ass_library);
- init_input(mpctx);
-
mpctx->playlist->current = mpctx->playlist->first;
play_files(mpctx);