Merge svn changes up to r29117

1 files changed, 19 insertions, 14 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 3b6c1873d8..667873c7c4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -31,7 +31,7 @@
 .\" Title
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2009-01-05" "The MPlayer Project" "The Movie Player"
+.TH MPlayer 1 "2009-03-25" "The MPlayer Project" "The Movie Player"
 .
 .SH NAME
 mplayer  \- movie player
@@ -904,7 +904,7 @@ i.e.\& using the shell.
 MPlayer uses this command without any checking, it is your responsibility
 to ensure it does not cause security problems (e.g.\& make sure to use full
 paths if "." is in your path like on Windows).
-It also only works when playing video (i.e. not with \-novideo but works with \-vo null).
+It also only works when playing video (i.e.\& not with \-novideo but works with \-vo null).
 .sp 1
 This can be "misused" to disable screensavers that do not support the proper
 X API (also see \-stop\-xscreensaver).
@@ -960,7 +960,7 @@ Device to be used for Apple IR Remote (default is autodetected, Linux only).
 Delay in milliseconds before we start to autorepeat a key (0 to disable).
 .IPs ar-rate
 Number of key presses to generate per second on autorepeat.
-.IPs (no)default-binds
+.IPs (no)default-bindings
 Use the key bindings that MPlayer ships with by default.
 .IPs keylist
 Prints all keys that can be bound to commands.
@@ -1133,7 +1133,7 @@ by a newline (\\n) from stdin.
 .I NOTE:
 See \-input cmdlist for a list of slave commands and DOCS/tech/slave.txt
 for their description.
-Also, this is not intended to disable other inputs, e.g. via the video window,
+Also, this is not intended to disable other inputs, e.g.\& via the video window,
 use some other method like \-input nodefault\-binds:conf=/dev/null for that.
 .
 .TP
@@ -3119,6 +3119,9 @@ It also supports the standard X11 \-geometry option format.
 If an external window is specified using the \-wid option, then the x and
 y coordinates are relative to the top-left corner of the window rather
 than the screen.
+The coordinates are relative to the screen given with \-xineramascreen for
+the video output drivers that fully support \-xineramascreen (direct3d, gl, gl2,
+vdpau, x11, xv, xvmc).
 .br
 .I NOTE:
 This option is only supported by the x11, xmga, xv, xvmc, xvidix,
@@ -3225,7 +3228,7 @@ Use at your own risk!
 Change the range of the pan-and-scan functionality (default: 1).
 Positive values mean multiples of the default range.
 Negative numbers mean you can zoom in up to a factor of \-panscanrange+1.
-E.g. \-panscanrange \-3 allows a zoom factor of up to 4.
+E.g.\& \-panscanrange \-3 allows a zoom factor of up to 4.
 This feature is experimental.
 Do not report bugs unless you are using \-vo gl.
 .
@@ -3455,25 +3458,27 @@ Apply a noise reduction algorithm to the video (default: 0, no noise reduction).
 .IPs deint=<0\-4>
 Chooses the deinterlacer (default: 0).
 All modes > 0 respect \-field\-dominance.
-.br
-.I NOTE:
-Values > 2 delay the video output by one frame.
 .RSss
 .IPs 0
 No deinterlacing.
 .IPs 1
 Show only first field, similar to \-vf field.
 .IPs 2
-Bob deinterlacing (current fallback for advanced deinterlacers).
+Bob deinterlacing, similar to \-vf tfields=1.
 .IPs 3
-Motion adaptive temporal deinterlacing (not yet working).
+Motion adaptive temporal deinterlacing.
+May lead to A/V desync with slow video hardware and/or high resolution.
 This is the default if "D" is used to enable deinterlacing.
 .IPs 4
-Motion adaptive temporal deinterlacing with edge-guided spatial interpolation
-(not yet working).
+Motion adaptive temporal deinterlacing with edge-guided spatial interpolation.
+Needs fast video hardware.
 .RE
+.IPs chroma\-deint
+Makes temporal deinterlacers operate both on luma and chroma (default).
+Use nochroma\-deint to solely use luma and speed up advanced deinterlacing.
+Useful with slow video memory.
 .IPs pullup
-Try to apply inverse telecine, needs temporal deinterlacing.
+Try to apply inverse telecine, needs motion adaptive temporal deinterlacing.
 .RE
 .PD 1 
 .
@@ -10050,7 +10055,7 @@ Lower values allow the quantizer value to jump around more,
 higher values force it to vary more smoothly.
 cplx_blur ensures that each I-frame has quality comparable to the following
 P-frames, and ensures that alternating high and low complexity frames
-(e.g. low fps animation) do not waste bits on fluctuating quantizer.
+(e.g.\& low fps animation) do not waste bits on fluctuating quantizer.
 .
 .TP
 .B qblur=<0\-99> (two pass only)