summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-29 22:08:38 +0100
committerwm4 <wm4@nowhere>2020-02-29 22:08:38 +0100
commitfaf24a286fb69ef6b93522a4678fad81b6e989f6 (patch)
tree929ffb2ac893a029e43e2f968a78ac249dd97002
parenta3823ce0e0353fa4ae4b75b0ff2cc17e61969005 (diff)
downloadmpv-faf24a286fb69ef6b93522a4678fad81b6e989f6.tar.bz2
mpv-faf24a286fb69ef6b93522a4678fad81b6e989f6.tar.xz
ad_lavc: disable decoder downmix by default
Let's see how much everyone hates this. Leaving it enabled seems problematic, because libavcodec returns an unspecific error if it doesn't like it. Fixes: #6300
-rw-r--r--DOCS/man/options.rst2
-rw-r--r--audio/decode/ad_lavc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 982e8c1830..c34dc5cc57 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1829,7 +1829,7 @@ Audio
other players) ignore this for the sake of better audio quality.
``--ad-lavc-downmix=<yes|no>``
- Whether to request audio channel downmixing from the decoder (default: yes).
+ Whether to request audio channel downmixing from the decoder (default: no).
Some decoders, like AC-3, AAC and DTS, can remix audio on decoding. The
requested number of output channels is set with the ``--audio-channels`` option.
Useful for playing surround audio on a stereo system.
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 63f9aa0cbe..a4e06822b7 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -72,7 +72,7 @@ const struct m_sub_options ad_lavc_conf = {
.size = sizeof(struct ad_lavc_params),
.defaults = &(const struct ad_lavc_params){
.ac3drc = 0,
- .downmix = 1,
+ .downmix = 0,
.threads = 1,
},
};