summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-05 18:53:02 +0200
committerwm4 <wm4@nowhere>2015-10-05 19:12:23 +0200
commit54fbda2ba40de1d94d49cef2c46160eb7ffa195a (patch)
tree0749d3a757f8abee199222bf08f802b2a7c2a4f1 /options
parente694d6736699d385772a3942aad52bba4bb7caf9 (diff)
downloadmpv-54fbda2ba40de1d94d49cef2c46160eb7ffa195a.tar.bz2
mpv-54fbda2ba40de1d94d49cef2c46160eb7ffa195a.tar.xz
audio: add option for falling back to ao_null
The manpage entry explains this. (Maybe this option could be always enabled and removed. I don't quite remember what valid use-cases there are for just disabling audio entirely, other than that this is also needed for audio decoder init failure.)
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 02ee782f75..7c04342384 100644
--- a/options/options.c
+++ b/options/options.c
@@ -383,6 +383,7 @@ const m_option_t mp_opts[] = {
OPT_SETTINGSLIST("ao-defaults", ao_defs, 0, &ao_obj_list),
OPT_STRING("audio-device", audio_device, 0),
OPT_STRING("audio-client-name", audio_client_name, 0),
+ OPT_FLAG("audio-fallback-to-null", ao_null_fallback, 0),
OPT_CHOICE("force-window", force_vo, 0,
({"no", 0}, {"yes", 1}, {"immediate", 2})),
OPT_FLAG("ontop", vo.ontop, M_OPT_FIXED),
diff --git a/options/options.h b/options/options.h
index 2a4bb8302d..75156043b3 100644
--- a/options/options.h
+++ b/options/options.h
@@ -81,6 +81,7 @@ typedef struct MPOpts {
struct m_obj_settings *audio_driver_list, *ao_defs;
char *audio_device;
char *audio_client_name;
+ int ao_null_fallback;
int force_vo;
int softvol;
float mixer_init_volume;