RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-10 08:13:03 +00:00
Code Issues Releases Wiki Activity

cfg-mplayer: do not include encode options when encoding disabled

Browse Source 
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.
This commit is contained in:
wm4 2012-11-14 02:34:42 +01:00
parent 9fc682d46f
commit d49e8ee164
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cfg-mplayer.h
View File

@ -726,6 +726,7 @@ const m_option_t mplayer_opts[]={
{"help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"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}, {"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("o", encode_output.file, CONF_GLOBAL),
OPT_STRING("of", encode_output.format, CONF_GLOBAL), OPT_STRING("of", encode_output.format, CONF_GLOBAL),
OPT_STRINGLIST("ofopts*", encode_output.fopts, 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("oneverdrop", encode_output.neverdrop, CONF_GLOBAL),
OPT_MAKE_FLAGS("ovfirst", encode_output.video_first, CONF_GLOBAL), OPT_MAKE_FLAGS("ovfirst", encode_output.video_first, CONF_GLOBAL),
OPT_MAKE_FLAGS("oafirst", encode_output.audio_first, CONF_GLOBAL), OPT_MAKE_FLAGS("oafirst", encode_output.audio_first, CONF_GLOBAL),
#endif
{NULL, NULL, 0, 0, 0, 0, NULL} {NULL, NULL, 0, 0, 0, 0, NULL}
}; };