Merge svn changes up to r28103

1 files changed, 8 insertions, 3 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 2884a4f458..86a3b4c225 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3624,7 +3624,7 @@ but also makes use of newer extensions, which allow support for more
 colorspaces and direct rendering.
 For optimal speed try something similar to
 .br
-\-vo gl:yuv=2:force\-pbo:ati\-hack \-dr \-noslices
+\-vo gl:yuv=2:rectangle=2:force\-pbo:ati\-hack \-dr \-noslices
 .br
 The code performs very few checks, so if a feature does not work, this
 might be because it is not supported by your card/OpenGL implementation
@@ -3714,6 +3714,9 @@ Provides brightness, contrast, saturation, hue and gamma control.
 Gamma can also be set independently for red, green and blue.
 Speed depends more on GPU memory bandwidth than other methods.
 .RE
+.IPs ycbcr
+Use the GL_MESA_ycbcr_texture extension to convert YUV to RGB.
+In most cases this is probably slower than doing software conversion to RGB.
 .IPs lscale=<n>
 Select the scaling function to use for luminance scaling.
 Only valid for yuv modes 2, 3, 4 and 6.
@@ -3730,13 +3733,15 @@ Works on a few more cards than method 1.
 3: Same as 1 but does not use a lookup texture.
 Might be faster on some cards.
 .br
-4: Use experimental unsharp masking with 3x3 support and a strength of 0.5.
+4: Use experimental unsharp masking with 3x3 support and a default strength of 0.5 (see filter-strength).
 .br
-5: Use experimental unsharp masking with 5x5 support and a strength of 0.5.
+5: Use experimental unsharp masking with 5x5 support and a default strength of 0.5 (see filter-strength).
 .RE
 .IPs cscale=<n>
 Select the scaling function to use for chrominance scaling.
 For details see lscale.
+.IPs filter-strength=<value>
+Set the effect strength for the lscale/cscale filters that support it.
 .IPs customprog=<filename>
 Load a custom fragment program from <filename>.
 See TOOLS/edgedect.fp for an example.