diff options
author | wm4 <wm4@nowhere> | 2012-11-14 02:34:42 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-14 11:47:33 +0100 |
commit | d49e8ee164fa5e0276827695bcc20aa2c926ac34 (patch) | |
tree | 218b2585c38e1cb8794de0b51f20899a91261968 | |
parent | 9fc682d46ff908556dcbd1ac78ed983f480976a5 (diff) |
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.
-rw-r--r-- | core/cfg-mplayer.h | 2 |
1 files changed, 2 insertions, 0 deletions
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} }; |