summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-17 16:00:12 +0100
committerwm4 <wm4@nowhere>2013-01-17 16:38:03 +0100
commita410d82adeef52354f819d53c988cf48fa575f65 (patch)
treeea15f4584992d4fbe908b4b29e08cd5e6d7a0c81 /DOCS
parent89a49ffd74f8be4ff36b0e6500e7b4434944c7fa (diff)
downloadmpv-a410d82adeef52354f819d53c988cf48fa575f65.tar.bz2
mpv-a410d82adeef52354f819d53c988cf48fa575f65.tar.xz
manpage: fix places that still treat FourCCs and pixel formats equal
The video filter chain traditionally used FourCCs for pixel formats. This was recently changed, but some parts of the manpage were not updated properly. Now there are two rypes of options: some which take a FourCC (as used with raw video formats), and some which take a symbolic format identifier (as used in the video filter chain). I realize that it's harder to specify FourCC for RGB formats now (TV stuff may need RGB). They use non-printable characters as part of the FourCC, and have to be specified as hexadecimal numbers (instead of a symbolic identifier). Because I can't be bothered to find out what these numbers are for the respective formats, just remove the old pseudo-FourCCs from the documentation.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/options.rst5
-rw-r--r--DOCS/man/en/vf.rst20
2 files changed, 12 insertions, 13 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index a9b69a0316..f2787cdf78 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2026,9 +2026,8 @@
outfmt=<value>
Specify the output format of the tuner with a preset value supported
- by the V4L driver (yv12, rgb32, rgb24, rgb16, rgb15, uyvy, yuy2, i420)
- or an arbitrary format given as hex value. Try outfmt=help for a list
- of all available formats.
+ by the V4L driver (YV12, UYVY, YUY2, I420)
+ or an arbitrary format given as hex value.
width=<value>
output window width
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst
index 439701754a..09fb4e37c0 100644
--- a/DOCS/man/en/vf.rst
+++ b/DOCS/man/en/vf.rst
@@ -214,36 +214,36 @@ dsize[=aspect|w:h:aspect-method:r]
<r>
Rounds up to make both width and height divisible by <r> (default: 1).
-format[=fourcc[:outfourcc]]
+format[=fmt[:outfmt]]
Restricts the colorspace for the next filter without doing any conversion.
Use together with the scale filter for a real conversion.
*NOTE*: For a list of available formats see ``format=fmt=help``.
- <fourcc>
- format name like rgb15, bgr24, yv12, etc (default: yuy2)
- <outfourcc>
+ <fmt>
+ format name like rgb15, bgr24, 420p, etc (default: yuyv)
+ <outfmt>
Format name that should be substituted for the output. If this is not
- 100% compatible with the <fourcc> value it will crash.
+ 100% compatible with the <fmt> value it will crash.
*EXAMPLE*
====================== =====================
Valid Invalid (will crash)
====================== =====================
- ``format=rgb24:bgr24`` ``format=rgb24:yv12``
- ``format=yuyv:yuy2``
+ ``format=rgb24:bgr24`` ``format=rgb24:420p``
+ ``format=yuyv:uyvy``
====================== =====================
-noformat[=fourcc]
+noformat[=fmt]
Restricts the colorspace for the next filter without doing any conversion.
Unlike the format filter, this will allow any colorspace except the one
you specify.
*NOTE*: For a list of available formats see ``noformat=fmt=help``.
- <fourcc>
- format name like rgb15, bgr24, yv12, etc (default: yv12)
+ <fmt>
+ format name like rgb15, bgr24, 420p, etc (default: 420p)
pp[=filter1[:option1[:option2...]]/[-]filter2...]
Enables the specified chain of postprocessing subfilters. Subfilters must