summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/options.rst5
-rw-r--r--audio/chmap.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 6a45cbb8ab..82b8bf95a9 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -907,8 +907,9 @@ Audio
lists speaker names, which can be used to express arbitrary channel
layouts (e.g. ``fl-fr-lfe`` is 2.1).
- You can use ``--audio-channels=empty`` to disable this. In this case, the AO
- use the channel layout as the audio filter chain indicates.
+ You can use ``--audio-channels=auto`` to disable this. In this case, the AO
+ use the channel layout as the audio filter chain indicates. (``empty`` is
+ an accepted obsolete for ``auto``.)
This will also request the channel layout from the decoder. If the decoder
does not support the layout, it will fall back to its native channel layout.
diff --git a/audio/chmap.c b/audio/chmap.c
index 316ca35c94..a4d06bb700 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -86,6 +86,7 @@ static const char *const std_layout_names[][2] = {
{"7.1(wide-side)", "fl-fr-fc-lfe-flc-frc-sl-sr"},
{"octagonal", "fl-fr-fc-bl-br-bc-sl-sr"},
{"downmix", "dl-dr"},
+ {"auto", ""}, // not in lavc
{0}
};