Merge svn changes up to 27824

Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c

1 files changed, 27 insertions, 21 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a169cbe613..bd1f196ced 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3080,7 +3080,7 @@ than the screen.
 .br
 .I NOTE:
 This option is only supported by the x11, xmga, xv, xvmc, xvidix,
-gl, gl2, directx and tdfxfb video output drivers.
+gl, gl2, directx, fbdev and tdfxfb video output drivers.
 .sp 1
 .I EXAMPLE:
 .PD 0
@@ -3206,12 +3206,12 @@ Not supported by all video output drivers.
 .
 .TP
 .B \-screenh <pixels>
-Specify the vertical screen resolution for video output drivers which
+Specify the screen height for video output drivers which
 do not know the screen resolution like fbdev, x11 and TV-out.
 .
 .TP
 .B \-screenw <pixels>
-Specify the horizontal screen resolution for video output drivers which
+Specify the screen width for video output drivers which
 do not know the screen resolution like fbdev, x11 and TV-out.
 .
 .TP
@@ -9093,7 +9093,6 @@ FIXME: Document this.
 FIXME: Document this.
 .
 .
-.
 .SS nuv (\-nuvopts)
 .
 Nuppel video is based on RTJPEG and LZO.
@@ -10043,7 +10042,7 @@ exhaustive search (very slow, and no better than umh)
 radius of exhaustive or multi-hexagon motion search (default: 16)
 .
 .TP
-.B subq=<1\-7>
+.B subq=<1\-9>
 Adjust subpel refinement quality.
 This parameter controls quality versus speed tradeoffs involved in the motion
 estimation decision process.
@@ -10068,12 +10067,18 @@ Then selects the best type.
 Then finishes the quarterpixel refinement for that type.
 .IPs 5
 Runs best quality quarterpixel precision motion estimation on all
-candidate macroblock types, before selecting the best type (default).
+candidate macroblock types, before selecting the best type.
+Also refines the two motion vectors used in bidirectional macroblocks,
+rather than reusing vectors from the forward and backward searches.
 .IPs 6
 Enables rate-distortion optimization of macroblock types in
-I- and P-frames.
+I- and P-frames (default).
 .IPs 7
-Enables rate-distortion optimization of motion vectors and intra modes. (best)
+Enables rate-distortion optimization of macroblock types in all frames.
+.IPs 8
+Enables rate-distortion optimization of motion vectors and intra prediction modes in I- and P-frames.
+.IPs 9
+Enables rate-distortion optimization of motion vectors and intra prediction modes in all frames (best).
 .RE
 .PD 1
 .RS
@@ -10095,18 +10100,7 @@ Without this option, a whole macroblock must use the same reference.
 Requires frameref>1.
 .
 .TP
-.B (no)brdo
-Enables rate-distortion optimization of macroblock types in B-frames.
-Requires subq>=6.
-.
-.TP
-.B (no)bime
-Refine the two motion vectors used in bidirectional macroblocks,
-rather than re-using vectors from the forward and backward searches.
-This option has no effect without B-frames.
-.
-.TP
-.B trellis=<0\-2>
+.B trellis=<0\-2> (cabac only)
 rate-distortion optimal quantization
 .PD 0
 .RSs
@@ -10120,6 +10114,19 @@ enabled during all mode decisions (slow, requires subq>=6)
 .PD 1
 .
 .TP
+.B psy-rd=rd[:trell]
+Sets the strength of the psychovisual optimization.
+.PD 0
+.RSs
+.IPs rd=<0.0\-10.0>
+psy optimization strength (requires subq>=6) (default: 1.0)
+.IPs trell=<0.0\-10.0>
+trellis (requires trellis, experimental) (default: 0.0)
+.RE
+.PD 1
+.
+.
+.TP
 .B deadzone_inter=<0\-32>
 Set the size of the inter luma quantization deadzone for non-trellis
 quantization (default: 21).
@@ -10515,7 +10522,6 @@ Encryption key the demuxer should use.
 This is the raw binary data of the key converted to a hexadecimal string.
 .
 .
-.
 .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf)
 .
 .TP