summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/af.rst10
-rw-r--r--DOCS/man/options.rst2
2 files changed, 4 insertions, 8 deletions
diff --git a/DOCS/man/af.rst b/DOCS/man/af.rst
index ec6ce3f6c3..be90f09b62 100644
--- a/DOCS/man/af.rst
+++ b/DOCS/man/af.rst
@@ -63,13 +63,9 @@ Available filters are:
(If you just want to set defaults for this filter that will be used
even by automatically inserted lavrresample instances, you should
prefer setting them with ``--af-defaults=lavrresample:...``.)
- ``normalize=<yes|no>``
- Whether to normalize when remixing channel layouts (default: yes). This
- is e.g. applied when downmixing surround audio to stereo. The advantage
- is that this guarantees that no clipping can happen. Unfortunately,
- this can also lead to too low volume levels. Whether you enable or
- disable this is essentially a matter of taste, but the default uses
- the safer choice.
+ ``normalize=<yes|no|auto>``
+ Whether to normalize when remixing channel layouts (default: auto).
+ ``auto`` uses the value set by ``--audio-normalize-downmix``.
``o=<string>``
Set AVOptions on the SwrContext or AVAudioResampleContext. These should
be documented by FFmpeg or Libav.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index ddc4f82979..579440e6a4 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -539,7 +539,7 @@ Video
filters all frames, but doesn't render them on the VO. It tries to query
the display FPS (X11 only, not correct on multi-monitor systems), or
assumes infinite display FPS if that fails. Drops are indicated in
- the terminal status line as ``D:`` field. If the decoder is too slow,
+ the terminal status line as ``Dropped:`` field. If the decoder is too slow,
in theory all frames would have to be dropped (because all frames are
too late) - to avoid this, frame dropping stops if the effective
framerate is below 10 FPS.