summaryrefslogtreecommitdiffstats
path: root/DOCS/xml
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
commitb0986b3760b0174be6a58e1754353102f3230c79 (patch)
tree0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /DOCS/xml
parent5fc54a6caad5f24b993da2e282c896269a6abc49 (diff)
parent23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff)
downloadmpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2
mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'DOCS/xml')
-rw-r--r--DOCS/xml/en/usage.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml
index ea74911b3f..2e9ef0e87f 100644
--- a/DOCS/xml/en/usage.xml
+++ b/DOCS/xml/en/usage.xml
@@ -930,8 +930,8 @@ more. Unfortunately, the suboptions are much more complicated.
<para>
The remaining suboptions specify how much of each channel gets mixed into each
other channel. This is the complicated part. To break the task down, split the
- suboptions into several sets, one set for each output channel. Each suboption
- within a set corresponds to an input channel. The number you specify will be
+ suboptions into several sets, one set for each input channel. Each suboption
+ within a set corresponds to an output channel. The number you specify will be
the percentage of the input channel that gets mixed into the output channel.
</para>
<para>