# HG changeset patch # User diego # Date 1146260042 0 # Node ID efe9012a8275dac725e31de2303d517abeb2a242 # Parent 32250170425ed8de6dc7f6948a619713327d29c5 Consistency for the 'i' key, document vglobal, aglobal and i_certify_that_i_am_the_longest_option_ever. diff -r 32250170425e -r efe9012a8275 DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Fri Apr 28 21:33:55 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Apr 28 21:34:02 2006 +0000 @@ -303,8 +303,8 @@ 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 @@ (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 @@ .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