Fix af_pan commandline mess and (hopefully) improve description.

It should now output the right number of channels and it doesn't silently
clamp values to the too restrictive [0, 1] range.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16494 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 9 insertions, 5 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index ff9aa07c13..b27f41d249 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3986,18 +3986,22 @@ this filter can be found in the examples section near the end.
 .PD 0
 .RSs
 .IPs <n>\ \ 
-number of input channels (1\-6)
+number of output channels (1\-6)
 .IPs <lij>
-How much of input channel j is mixed into output channel i (0\-1).
+How much of input channel i is mixed into output channel j (0\-1).
+So in principle you first have n numbers saying what to do with the
+first input channel, then n numbers that act on the second input channel
+etc.
+If you don't specify any numbers for some input channels, 0 is assumed.
 .RE
 .sp 1
 .RS
 .I EXAMPLE:
 .RE
 .RSs
-.IPs "mplayer \-af pan=1:0.5:0.5 \-channels 1 media.avi"
+.IPs "mplayer \-af pan=1:0.5:0.5 media.avi"
 Would down-mix from stereo to mono.
-.IPs "mplayer \-af pan=3:1:0:1:0.5:0.5 \-channels 3 media.avi"
+.IPs "mplayer \-af pan=3:1:0:0.5:0:1:0.5 media.avi"
 Would give 3 channel output leaving channels 0 and 1 intact,
 and mix channels 0 and 1 into output channel 2 (which could
 be sent to a subwoofer for example).
@@ -8963,7 +8967,7 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
 .
 .TP
 .B Play a 6-channel AAC file with only two speakers:
-mplayer \-rawaudio on:format=0xff \-af pan=6:.32:.39:.06:.17:-.17:.33:.32:.06:.39:-.17:.17:.33 adts_he-aac160_51.aac
+mplayer \-rawaudio on:format=0xff \-af pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac
 .br
 You might want to play a bit with the pan values (e.g multiply with a value) to
 increase volume or avoid clipping.