summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 03:18:42 +0200
commit0269d22d32fb380e7128ca0c60f6f1638c6dab70 (patch)
tree53ba64153d9ef930f73458138478a6d0def381ce /DOCS
parent240550bbb94653907faa6e0bb1c5ac3d279cc252 (diff)
parent97ef28ad9aa2f34aea0779062976ad4294c0af51 (diff)
downloadmpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.bz2
mpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.xz
Merge svn changes up to r30876
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.188
-rw-r--r--DOCS/xml/en/faq.xml10
2 files changed, 90 insertions, 8 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index beb16e4551..e542154378 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -7480,6 +7480,48 @@ Larger radius makes for smoother gradients, but also prevents the filter
from modifying pixels near detailed regions (default: 16).
.RE
.
+.TP
+.B fixpts[=options]
+Fixes the presentation timestamps (PTS) of the frames.
+By default, the PTS passed to the next filter is dropped, but the following
+options can change that:
+.RSs
+.IPs print
+Print the incoming PTS.
+.IPs fps=<fps>
+Specify a frame per second value.
+.IPs start=<pts>
+Specify an initial value for the PTS.
+.IPs autostart=<n>
+Uses the
+.IR n th
+incoming PTS as the initial PTS.
+All previous pts are kept, so setting a huge value or \-1 keeps the PTS
+intact.
+.IPs autofps=<n>
+Uses the
+.IR n th
+incoming PTS after the end of autostart to determine the framerate.
+.RE
+.sp 1
+.RS
+.I EXAMPLE:
+.RE
+.PD 0
+.RSs
+.IPs "\-vf fixpts=fps=24000/1001,ass,fixpts"
+Generates a new sequence of PTS, uses it for ASS subtitles, then drops it.
+Generating a new sequence is useful when the timestamps are reset during the
+program; this is frequent on DVDs.
+Dropping it may be necessary to avoid confusing encoders.
+.RE
+.PD 1
+.sp 1
+.RS
+.I NOTE:
+Using this filter together with any sort of seeking (including -ss and EDLs)
+may make demons fly out of your nose.
+.RE
.
.
.SH "GENERAL ENCODING OPTIONS (MENCODER ONLY)"
@@ -10668,6 +10710,52 @@ SVC encodes.
.TP
.B (no)aud
Write access unit delimeters to the stream (default: disabled).
+Enable this only if your target container format requires access unit
+delimiters.
+.
+.TP
+.B overscan=<undef|show|crop>
+Include VUI overscan information in the stream (default: disabled).
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B videoformat=<component|pal|ntsc|secam|mac|undef>
+Include VUI video format information in the stream (default: disabled).
+This is a purely informative setting for describing the original source.
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B (no)fullrange
+Include VUI full range information in the stream (default: disabled).
+Use this option if your source video is not range limited.
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B colorprim=<bt709|bt470m|bt470bg|smpte170m|smpte240m|film|undef>
+Include color primaries information (default: disabled).
+This can be used for color correction.
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B transfer=<bt709|bt470m|bt470bg|linear|log100|log316|smpte170m|smpte240m>
+Include VUI transfer characteristics information in the stream
+(default: disabled).
+This can be used for color correction.
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B colormatrix=<bt709|fcc|bt470bg|smpte170m|smpte240m|GBR|YCgCo>
+Include VUI matrix coefficients in the stream (default: disabled).
+This can be used for color correction.
+See doc/vui.txt in the x264 source code for more information.
+.
+.TP
+.B chromaloc=<0-5>
+Include VUI chroma sample location information in the stream (default:
+disabled).
+Use this option to ensure alignment of the chroma and luma planes after
+color space conversions.
+See doc/vui.txt in the x264 source code for more information.
.
.TP
.B log=<\-1\-3>
diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index 9234ad7334..58450c3d83 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -789,14 +789,8 @@ while seeking through RealMedia streams?
What about DVD navigation/menus?
</para></question>
<answer><para>
-<application>MPlayer</application> does not support DVD menus due to serious
-architectural limitations that prevent proper handling of still images and
-interactive content. If you want to have fancy menus, you will have to use
-another player like <application>xine</application>,
-<application>VLC</application> or <application>Ogle</application>.
-If you want to see DVD navigation in <application>MPlayer</application> you
-will have to implement it yourself, but be aware that it is a major
-undertaking.
+<application>MPlayer</application> should support DVD menus nowadays.
+Your mileage may vary.
</para></answer>
</qandaentry>