summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-05 23:37:42 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-05 23:37:42 +0300
commit8362ad36ac2ee8dc452765a9de559b50927d14be (patch)
tree93c9ab1208e7186a03c12cf580b0bde04bca0ec7 /DOCS
parentb6db3567508ea5a4313e2a4894fe96d1840fd74f (diff)
parent601d6af3ece91f65df77ed213a7eafb56e75abd1 (diff)
downloadmpv-8362ad36ac2ee8dc452765a9de559b50927d14be.tar.bz2
mpv-8362ad36ac2ee8dc452765a9de559b50927d14be.tar.xz
Merge svn changes up to r31332
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.113
1 files changed, 12 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 6303db7c83..05fa8a04c0 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -6106,7 +6106,7 @@ Also perform R <\-> B swapping.
RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette.
.
.TP
-.B format[=fourcc]
+.B format[=fourcc[:outfourcc]]
Restricts the colorspace for the next filter without doing any conversion.
Use together with the scale filter for a real conversion.
.br
@@ -6116,6 +6116,17 @@ For a list of available formats see format=fmt=help.
.RSs
.IPs <fourcc>
format name like rgb15, bgr24, yv12, etc (default: yuy2)
+.IPs <outfourcc>
+Format name that should be substituted for the output.
+If this is not 100% compatible with the <fourcc> value it will crash.
+.br
+Valid examples:
+.br
+format=rgb24:bgr24 format=yuyv:yuy2
+.br
+Invalid examples (will crash):
+.br
+format=rgb24:yv12
.RE
.PD 1
.