summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defaultopts.c2
-rw-r--r--mplayer.c11
2 files changed, 1 insertions, 12 deletions
diff --git a/defaultopts.c b/defaultopts.c
index 98abc00831..672dbd5f5c 100644
--- a/defaultopts.c
+++ b/defaultopts.c
@@ -22,7 +22,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
.vo_gamma_contrast = 1000,
.vo_gamma_saturation = 1000,
.vo_gamma_hue = 1000,
- .osd_level = -1,
+ .osd_level = 1,
.osd_duration = 1000,
.loop_times = -1,
.ordered_chapters = 1,
diff --git a/mplayer.c b/mplayer.c
index 784de4b2ee..7fa37641fc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4391,22 +4391,11 @@ int main(int argc, char *argv[])
mp_msg(MSGT_VO, MSGL_INFO, "Encoding initialization failed.");
exit_player(mpctx, EXIT_ERROR, 1);
}
- }
-
- if (opts->encode_output.file) {
m_config_set_option0(mpctx->mconfig, "vo", "lavc");
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");
m_config_set_option0(mpctx->mconfig, "untimed", "yes");
-
- // default osd level 0
- if (opts->osd_level < 0)
- m_config_set_option0(mpctx->mconfig, "osdlevel", "0");
- } else {
- // default osd level 1
- if (opts->osd_level < 0)
- m_config_set_option0(mpctx->mconfig, "osdlevel", "1");
}
#endif