summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/options.rst8
-rw-r--r--etc/example.conf5
2 files changed, 11 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7a66b0f798..da40cadb97 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1028,6 +1028,14 @@ Audio
If the channel layout of the media file (i.e. the decoder) and the AO's
channel layout don't match, mpv will attempt to insert a conversion filter.
+ .. admonition:: Warning
+
+ Using ``auto`` can cause issues when using audio over HDMI. The OS will
+ typically report all channel layouts that _can_ go over HDMI, even if
+ the receiver does not support them. If a receiver gets an unsupported
+ channel layout, random things can happen, such as dropping the
+ additional channels, or adding noise.
+
``--audio-display=<no|attachment>``
Setting this option to ``attachment`` (default) will display image
attachments (e.g. album cover art) when playing audio files. It will
diff --git a/etc/example.conf b/etc/example.conf
index e335c8ea12..4c545d9306 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -61,8 +61,9 @@
# Output 5.1 audio natively, and upmix/downmix audio with a different format.
#audio-channels=5.1
# Disable any automatic remix, _if_ the audio output accepts the audio format.
-# of the currently played file.
-#audio-channels=empty
+# of the currently played file. See caveats mentioned in the manpage.
+# (This is the default.)
+#audio-channels=auto
##################
# other settings #