diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
commit | 5c6795a687cd9149e57985b632cf7a1c4a5c8310 (patch) | |
tree | 60f61ddbcd8aa96f04b9851029923d81d0b0be89 /DOCS/man | |
parent | 8a93561c8187058ae6278c9c6adb5ada7bedeff4 (diff) | |
parent | d7a1d12f6147b53944a56117feae66d8e0e52fb1 (diff) | |
download | mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.bz2 mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.xz |
Merge svn changes up to r30494
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
Diffstat (limited to 'DOCS/man')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 5e11048552..bf1e2ba71f 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3842,8 +3842,9 @@ 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. +The default is auto-detection deciding between values 0 and 2. .RSss -0: Use software conversion (default). +0: Use software conversion. Compatible with all OpenGL versions. Provides brightness, contrast and saturation control. .br |