changeset 30033:241686e5cf5a

Slightly improve vo_gl suboption documentation.

--- a/DOCS/man/en/mplayer.1	Sat Dec 19 21:07:42 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Sat Dec 19 21:08:14 2009 +0000
@@ -3839,6 +3839,9 @@
 This limits the framerate to (horizontal refresh rate / n).
 Requires GLX_SGI_swap_control support to work.
 With some (most/all?) implementations this only works in fullscreen mode.
+.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 yuv=<n>
 Select the type of YUV to RGB conversion.
 .RSss
@@ -3882,9 +3885,6 @@
 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.
@@ -3922,6 +3922,13 @@
 .IPs (no)customtrect
 If enabled, use texture_rectangle for customtex texture.
 Default is disabled.
+.IPs (no)mipmapgen
+If enabled, mipmaps for the video are automatically generated.
+This should be useful together with the customprog and the TXB
+instruction to implement blur filters with a large radius.
+For most OpenGL implementations this is very slow for any non-RGB
+formats.
+Default is disabled.
 .RE
 .sp 1
 .RS

--- a/libvo/vo_gl.c	Sat Dec 19 21:07:42 2009 +0000
+++ b/libvo/vo_gl.c	Sat Dec 19 21:08:14 2009 +0000
@@ -1067,6 +1067,8 @@
               "    Interval in displayed frames between to buffer swaps.\n"
               "    1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n"
               "    Requires GLX_SGI_swap_control support to work.\n"
+              "  ycbcr\n"
+              "    also try to use the GL_MESA_ycbcr_texture extension\n"
               "  yuv=<n>\n"
               "    0: use software YUV to RGB conversion.\n"
               "    1: use register combiners (nVidia only, for older cards).\n"
@@ -1098,8 +1100,6 @@
               "    generate mipmaps for the video image (use with TXB in customprog)\n"
               "  osdcolor=<0xAARRGGBB>\n"
               "    use the given color for the OSD\n"
-              "  ycbcr\n"
-              "    also try to use the GL_MESA_ycbcr_texture extension\n"
               "\n" );
       return -1;
     }