Add -ao pcm suboptions and remove -aofile and -waveheader options.

Base on idea by Olivier Rolland (billl at users dot sf dot net)


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

1 files changed, 17 insertions, 11 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a41b21e6de..89a9c861f8 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1669,10 +1669,6 @@ Specify the VOBsub subtitle ID.
 Override audio driver/\:card buffer size detection.
 .
 .TP
-.B \-aofile <filename>
-Override the default filename employed by \-ao pcm.
-.
-.TP
 .B \-aop <list=plugin1,plugin2...:option1=value1:opt2=val2...>
 Specify audio plugin(s) and their options
 (also see the audio plugins section of the documentation).
@@ -1770,11 +1766,6 @@ With values below 100 the initial volume (which is 100%) will be above
 the maximum, which e.g.\& the OSD cannot display correctly.
 .
 .TP
-.B \-nowaveheader (\-ao pcm only)
-Don't include wave header.
-Used for raw PCM.
-.
-.TP
 .B \-volstep <0\-100>
 Set the step size of mixer volume changes in percent of the whole range
 (default: 3).
@@ -1908,9 +1899,24 @@ Produces no audio output but maintains video playback speed.
 Use \-nosound for benchmarking.
 .
 .TP
-.B pcm (also see \-aofile)
+.B pcm
 Raw PCM/\:wave file writer audio output.
-Writes the sound to ./audiodump.wav.
+.PD 0
+.RSs
+.IPs (no)waveheader
+Include or do not include the wave header (default: included).
+When not included, raw PCM will be generated.
+.IPs file=<filename>
+Write the sound to <filename> instead of the default
+audiodump.wav.
+.REss
+.PD 1
+.RS
+.sp 1
+.I NOTE:
+If you do not specify any option the output is progressive
+(i.e.\& not interlaced).
+.RE
 .
 .TP
 .B plugin\ \