From 65adad50ab04520748796b9752dcf61b44dafdd2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 17 Sep 2012 09:03:45 +0200 Subject: mplayer: unbreak OSD with CONFIG_ENCODING undefined Basically, the encoding code path wanted to set osdlevel=0 as default, while normal playback needs osdlevel=1. For this purpose, osdlevel was set to -1 (i.e. invalid) initially to detect whether the --osdlevel option was explicitly set. When encoding was not configured (CONFIG_ENCODING undefined), the osdlevel value was not set from -1 to 1 properly, and the OSD remained invisible by default. Fix this by getting rid of this logic. It shouldn't be needed, since osdlevel=1 never shows any OSD messages without user interaction. Should this ever change, we could still check whether encoding is in progress, or add another option to allow OSD rendering during encoding. --- mplayer.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'mplayer.c') 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 -- cgit v1.2.3