From d49e8ee164fa5e0276827695bcc20aa2c926ac34 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 14 Nov 2012 02:34:42 +0100 Subject: cfg-mplayer: do not include encode options when encoding disabled Normally, we always want to enable encoding, as it uses stock ffmpeg APIs and has no other dependencies or disadvantages. However, supporting older releases of ffmpeg and Libav (which equal to outdated git snapshots fix security and crash fixes applied) force us to disable some advanced ffmpeg API usage, which includes encoding. --- core/cfg-mplayer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/cfg-mplayer.h') diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index efb445cd68..20de5f3ebb 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -726,6 +726,7 @@ const m_option_t mplayer_opts[]={ {"help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"h", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, +#ifdef CONFIG_ENCODING OPT_STRING("o", encode_output.file, CONF_GLOBAL), OPT_STRING("of", encode_output.format, CONF_GLOBAL), OPT_STRINGLIST("ofopts*", encode_output.fopts, CONF_GLOBAL), @@ -743,6 +744,7 @@ const m_option_t mplayer_opts[]={ OPT_MAKE_FLAGS("oneverdrop", encode_output.neverdrop, CONF_GLOBAL), OPT_MAKE_FLAGS("ovfirst", encode_output.video_first, CONF_GLOBAL), OPT_MAKE_FLAGS("oafirst", encode_output.audio_first, CONF_GLOBAL), +#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; -- cgit v1.2.3