summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-28 21:34:02 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-28 21:34:02 +0000
commit3e1871bda87d9cc9f44cc96354c1dbd394c7c386 (patch)
tree7910b552c84990207106417b6355da40d3eefc42 /DOCS
parente1902e3087159b558ccb0c2fe64683384726d60d (diff)
downloadmpv-3e1871bda87d9cc9f44cc96354c1dbd394c7c386.tar.bz2
mpv-3e1871bda87d9cc9f44cc96354c1dbd394c7c386.tar.xz
Consistency for the 'i' key, document vglobal, aglobal and
i_certify_that_i_am_the_longest_option_ever. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18334 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.125
1 files changed, 20 insertions, 5 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 3842a0709d..32ca7211c0 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -303,8 +303,8 @@ Toggle subtitle alignment: top / middle / bottom.
Adjust subtitle delay by +/- 0.1 seconds.
.IPs "r and t"
Move subtitles up/down.
-.IPs i\ \ \ \
-Set EDL mark (while in \-edlout mode).
+.IPs "i (\-edlout mode only)"
+Set EDL mark.
.IPs "s (\-vf screenshot only)"
Take a screenshot.
.IPs "I"
@@ -8003,8 +8003,22 @@ Currently it only works if scene change detection is disabled
(sc_threshold=1000000000).
.
.TP
-.B vglobal
-FIXME: Document this.
+.B vglobal=<0\-3>
+Control writing global video headers.
+.PD 0
+.RSs
+.IPs 0
+Do not write global headers (default).
+.IPs 1
+Write global headers only in extradata (needed for .mp4/MOV/NUT).
+.IPs 2
+Write global headers only in front of keyframes.
+.IPs 3
+Combine 1 and 2.
+.
+.TP
+.B aglobal=<0\-3>
+Same as vglobal for audio headers.
.
.
.SS nuv (\-nuvopts)
@@ -9384,7 +9398,8 @@ Sony Digital Video container
.PD 1
.TP
.B i_certify_that_my_video_stream_does_not_use_b_frames
-FIXME: Document this.
+MEncoder cannot assign correct timestamps when there are
+B-frames in the video stream, resulting in broken encodes.
.
.TP
.B muxrate