summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-17 19:54:15 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-17 19:54:15 +0000
commit3a32338e808a831a97ee274cbb3185a7b798be12 (patch)
tree0062dedd7509e246b0b8605c44181d31b8268226 /DOCS
parent4b87be4a090ab3539c8266332a0cec8b6e7b9147 (diff)
downloadmpv-3a32338e808a831a97ee274cbb3185a7b798be12.tar.bz2
mpv-3a32338e808a831a97ee274cbb3185a7b798be12.tar.xz
Unify the descriptions of vo_gl and vo_gl2 including some fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16509 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.142
1 files changed, 8 insertions, 34 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index b27f41d249..aecc8744a0 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -2717,7 +2717,7 @@ slower (default: 0).
1: Use texture_rectangle, not compatible with hardware YUV conversion.
.br
2: Use texture_non_power_of_two.
-.REss
+.RE
.IPs (no)glfinish
Call glFinish() before swapping buffers.
Slower but in some cases more correct output (default: disabled).
@@ -2733,7 +2733,7 @@ With some (most/all?) implementations this only works in fullscreen mode.
Select the type of YUV to RGB conversion.
.RSss
0: Use software conversion (default).
-Compatible with all OpenGL version.
+Compatible with all OpenGL versions.
Provides brightness, contrast and saturation control.
.br
1: Use register combiners.
@@ -2742,20 +2742,20 @@ At least three texture units are needed.
Provides saturation and hue control.
.br
2: Use a fragment program.
-Needs GL_ARB_fragment_program extension and at least three texture units.
+Needs the GL_ARB_fragment_program extension and at least three texture units.
Provides brightness, contrast, saturation and hue control.
.br
3: Use a fragment program using the POW instruction.
-Needs GL_ARB_fragment_program extension and at least three texture units.
+Needs the GL_ARB_fragment_program extension and at least three texture units.
Provides brightness, contrast, saturation, hue and gamma control.
Gamma can also be set independently for red, green and blue.
Method 4 is usually faster.
.br
4: Use a fragment program with additional lookup.
-Needs GL_ARB_fragment_program extension and at least four texture units.
+Needs the GL_ARB_fragment_program extension and at least four texture units.
Provides brightness, contrast, saturation, hue and gamma control.
Gamma can also be set independently for red, green and blue.
-.REss
+.RE
.IPs customprog=<filename>
Load a custom fragment program from <filename>.
See TOOLS/edgedect.fp for an example.
@@ -2770,35 +2770,9 @@ Supports OSD and videos larger than the maximum texture size.
.PD 0
.RSs
.IPs (no)glfinish
-Call glFinish() before swapping buffers.
-Slower but in some cases more correct output (default: enabled).
+same as gl (default: enabled)
.IPs yuv=<n>
-Select the type of YUV to RGB conversion.
-.RSss
-0: Use software conversion (default).
-Compatible with all OpenGL version.
-Provides brightness, contrast and saturation control.
-.br
-1: Use register combiners.
-This uses an nVidia-specific extension (GL_NV_register_combiners).
-At least three texture units are needed.
-Provides saturation and hue control.
-.br
-2: Use a fragment program.
-Needs GL_ARB_fragment_program extension and at least three texture units.
-Provides brightness, contrast, saturation and hue control.
-.br
-3: Use a fragment program using the POW instruction.
-Needs GL_ARB_fragment_program extension and at least three texture units.
-Provides brightness, contrast, saturation, hue and gamma control.
-Gamma can also be set independently for red, green and blue.
-Method 4 is usually faster.
-.br
-4: Use a fragment program with additional lookup.
-Needs GL_ARB_fragment_program extension and at least four texture units.
-Provides brightness, contrast, saturation, hue and gamma control.
-Gamma can also be set independently for red, green and blue.
-.REss
+same as gl
.REss
.
.TP