diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /DOCS/man/en/mplayer.1 | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'DOCS/man/en/mplayer.1')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index a5ae7c902d..d5f540e164 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7376,7 +7376,7 @@ You can specify codec specific encoding parameters using the following syntax: . .TP -.B \-<codec>opts <option1[=value],option2,...> +.B \-<codec>opts <option1[=value1]:option2[=value2]:...> . .PP Where <codec> may be: lavc, xvidenc, lame, toolame, twolame, @@ -10693,6 +10693,12 @@ FIXME: Document this. .B VIDIX_CRT FIXME: Document this. . +.TP +.B VIDIXIVTVALPHA +Set this to 'disable' in order to stop the VIDIX driver from controlling +alphablending settings. +You can then manipulate it yourself with 'ivtvfbctl'. +. .SS osdep: . .TP |