fixes for previous commits

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

1 files changed, 24 insertions, 30 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 285ace3de2..cb681345e1 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3544,7 +3544,6 @@ Exceptions to this rule are: u8, s8, floatle, floatbe, floatne, mulaw, alaw,
 mpeg2, ac3 and imaadpcm.
 .RE
 .PD 1
-.br
 .
 .TP
 .B volume[=v:sc]
@@ -5290,7 +5289,7 @@ syntax:
 .B \-<codec>opts <option1[=value],option2,...>
 .
 .PP
-Where <codec> may be: lavc, xvidenc, divx4, lame, toolame, x264enc
+Where <codec> may be: lavc, xvidenc, divx4, lame, toolame, x264enc, mpeg.
 .
 .
 .SS divx4 (\-divx4opts)
@@ -7537,9 +7536,9 @@ In the above, "all candidates" doesn't exactly mean all enabled types:
 .B level_idc=<10\-51>
 Set the bitstream's Level as defined by Annex A of the H.264 standard
 (default: 40 - Level 4.0).
-This is used for telling the decoder what capabilities it needs to
-support. Use this parameter only if you know what it means, and you
-have a need to set it.
+This is used for telling the decoder what capabilities it needs to support.
+Use this parameter only if you know what it means,
+and you have a need to set it.
 .
 .TP
 .B log=<-1\-3>
@@ -7571,10 +7570,10 @@ PSNRs printed by log=3.
 .
 .SS MPEG muxer (\-mpegopts)
 .
-The MPEG muxer can generate 5 types of streams, each of which has reasonable default
-parameters that the user can override. Generally, when generating mpeg files, it's 
-advisable to disable mencoder's frame-skip code (see -noskip, -mc, harddup, softskip).
-.br
+The MPEG muxer can generate 5 types of streams, each of which has reasonable
+default parameters that the user can override.
+Generally, when generating mpeg files, it's advisable to disable mencoder's
+frame-skip code (see \-noskip, \-mc, harddup, softskip).
 .
 .TP
 .B format=<mpeg1 | mpeg2 | xvcd | xsvcd | dvd>
@@ -7582,7 +7581,8 @@ stream format (default: mpeg2).
 .
 .TP
 .B size=<up to 65535>
-pack size in bytes, don't change it if you don't know exactly what you are doing (default: 2048).
+pack size in bytes, don't change it if you don't know exactly what you are
+doing (default: 2048).
 .
 .TP
 .B muxrate=<int>
@@ -7590,57 +7590,51 @@ nominal muxrate in Kbit/s used in the pack headers (default: 1800 kb/s).
 Will be updated as necessary in the case of format=mpeg1 or mpeg2.
 .
 .TP
-.B tsaf
+.B tsaf\ \ \ 
 sets timestamps on all frames, if possible.
 .
 .TP
 .B noreorder
-disable the frame reordering code, that stores frames in decoding (rather than display) order.
-Use it only if you believe the reordering code is buggy and working improperly.
-Default: disabled.
+disable the frame reordering code, that stores frames in decoding (rather than
+display) order (default: disabled).
+Use it only if you believe the reordering code is buggy and working improperly
 .
 .TP
 .B init_vpts=<100\-700>
 Initial video pts, in milliseconds (default: 200).
 .
 .TP
-.B init_apts=<100\-700> 
+.B init_apts=<100\-700>
 Initial audio pts, in milliseconds (default: 200).
 .
-.
 .TP
-.B init_adelay=<-32760\--1> 
+.B init_adelay=<-32760\--1>
 Initial audio anticipation time == video delay, in milliseconds (default: 0).
 Use it if you want to delay video respect to audio.
 .
-.
 .TP
-.B drop 
-When used with init_adelay the muxer drops the part of audio that was anticipated.
-.
+.B drop\ \ \ 
+When used with init_adelay the muxer drops the part of audio that was
+anticipated.
 .
 .TP
-.B vwidth, vheight=<1,4095> 
+.B vwidth, vheight=<1,4095>
 These parameters patch the video width and height when video is mpeg1/2.
 .
-.
 .TP
-.B vpswidth, vpsheight=<1,4095> 
+.B vpswidth, vpsheight=<1,4095>
 Patch pan and scan video width and height when video is mpeg2.
 .
-.
 .TP
-.B vaspect=<1:1 | 4:3 | 16:9 | 2.21:1> 
+.B vaspect=<1:1 | 4:3 | 16:9 | 2.21:1>
 Patches the aspect ratio for mpeg1/2 video.
 .
-.
 .TP
-.B vbitrate=<int> 
+.B vbitrate=<int>
 Patches the video bitrate in Kbit/s for mpeg1/2 video.
 .
-.
 .TP
-.B vframerate=<23.976 | 24 | 25 | 29.97 | 30 | 50 | 59.94 | 60 > 
+.B vframerate=<23.976 | 24 | 25 | 29.97 | 30 | 50 | 59.94 | 60 >
 Patches the framerate for mpeg1/2 video.
 .
 .