diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /DOCS/man/en | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'DOCS/man/en')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 56 |
1 files changed, 37 insertions, 19 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index b1493742f0..7a672c8016 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -1555,10 +1555,10 @@ Falls back on IPv4 automatically. . .TP .B \-psprobe <byte position> -When playing an MPEG-PS stream, this option lets you specify how many -bytes in the stream you want MPlayer to scan in order to identify the -video codec used. -This option is needed to play EVO files containing H.264 streams. +When playing an MPEG-PS or MPEG-PES streams, this option lets you specify +how many bytes in the stream you want MPlayer to scan in order to identify +the video codec used. +This option is needed to play EVO or VDR files containing H.264 streams. . .TP .B \-pvr <option1:option2:...> (PVR only) @@ -3341,6 +3341,8 @@ with \-v option and look out for the lines tagged with [xv common] at the beginning. .PD 0 .RSs +.IPs adaptor=<number> +Select a specific XVideo adaptor (check xvinfo results). .IPs port=<number> Select a specific XVideo port. .IPs ck=<cur|use|set> @@ -3389,6 +3391,8 @@ Video output driver that uses the XvMC (X Video Motion Compensation) extension of XFree86 4.x to speed up MPEG-1/2 and VCR2 decoding. .PD 0 .RSs +.IPs adaptor=<number> +Select a specific XVideo adaptor (check xvinfo results). .IPs port=<number> Select a specific XVideo port. .IPs (no)benchmark @@ -4448,6 +4452,8 @@ This is not a bug, but a side effect of not decoding at full resolution. If <w> is specified lowres decoding will be used only if the width of the video is major than or equal to <w>. .RE +.IPs "o\ \ \ \ " +FIXME: undocumented .IPs "sb=<number> (MPEG-2 only)" Skip the given number of macroblock rows at the bottom. .IPs "st=<number> (MPEG-2 only)" @@ -7718,7 +7724,7 @@ Windows Media Video, version 2 (AKA WMV8) . .TP .B vqmin=<1\-31> -minimum quantizer (pass 1/2) +minimum quantizer .RSs .IPs 1 Not recommended (much larger file, little quality difference and weird side @@ -7776,7 +7782,7 @@ effect. . .TP .B vqmax=<1\-31> -Maximum quantizer (pass 1/2), 10\-31 should be a sane range (default: 31). +Maximum quantizer, 10\-31 should be a sane range (default: 31). . .TP .B mbqmin=<1\-31> @@ -7789,7 +7795,7 @@ obsolete, use vqmax .TP .B vqdiff=<1\-31> maximum quantizer difference between consecutive I- or P-frames -(pass 1/2) (default: 3) +(default: 3) . .TP .B vmax_b_frames=<0\-4> @@ -8056,7 +8062,7 @@ always on. . .TP .B vbitrate=<value> -Specify bitrate (pass 1/2) (default: 800). +Specify bitrate (default: 800). .br .I WARNING: 1kbit = 1000 bits @@ -8082,17 +8088,17 @@ be problems if vrc_(min|max)rate is used. . .TP .B vrc_maxrate=<value> -maximum bitrate in kbit/\:sec (pass 1/2) +maximum bitrate in kbit/\:sec (default: 0, unlimited) . .TP .B vrc_minrate=<value> -minimum bitrate in kbit/\:sec (pass 1/2) +minimum bitrate in kbit/\:sec (default: 0, unlimited) . .TP .B vrc_buf_size=<value> -buffer size in kbit (pass 1/2). +buffer size in kbit For MPEG-1/2 this also sets the vbv buffer size, use 327 for VCD, 917 for SVCD and 1835 for DVD. . @@ -8117,19 +8123,19 @@ with support for Xvid 1.1 or higher). . .TP .B vb_qfactor=<\-31.0\-31.0> -quantizer factor between B- and non-B-frames (pass 1/2) (default: 1.25) +quantizer factor between B- and non-B-frames (default: 1.25) . .TP .B vi_qfactor=<\-31.0\-31.0> -quantizer factor between I- and non-I-frames (pass 1/2) (default: 0.8) +quantizer factor between I- and non-I-frames (default: 0.8) . .TP .B vb_qoffset=<\-31.0\-31.0> -quantizer offset between B- and non-B-frames (pass 1/2) (default: 1.25) +quantizer offset between B- and non-B-frames (default: 1.25) . .TP .B vi_qoffset=<\-31.0\-31.0> -(pass 1/2) (default: 0.0) +(default: 0.0) .br if v{b|i}_qfactor > 0 .br @@ -8165,7 +8171,7 @@ the quantizer more over time (slower change). . .TP .B vqcomp=<0.0\-1.0> -Quantizer compression, vrc_eq depends upon this (pass 1/2) (default: 0.5). +Quantizer compression, vrc_eq depends upon this (default: 0.5). For instance, assuming the default rate control equation is used, if vqcomp=1.0, the ratecontrol allocates to each frame the number of bits needed to encode them all at the same QP. @@ -8177,7 +8183,7 @@ Perceptual quality will be optimal somewhere in between these two extremes. . .TP .B vrc_eq=<equation> -main ratecontrol equation (pass 1/2) +main ratecontrol equation .RE .RSs .IPs "1\ \ \ \ " @@ -8250,7 +8256,7 @@ is 1 if a==b, 0 otherwise . .TP .B vrc_override=<options> -User specified quality for specific parts (ending, credits, ...) (pass 1/2). +User specified quality for specific parts (ending, credits, ...). The options are <start-frame>, <end-frame>, <quality>[/<start-frame>, <end-frame>, <quality>[/...]]: .PD 0 @@ -8272,7 +8278,7 @@ initial buffer occupancy, as a fraction of vrc_buf_size (default: 0.9) . .TP .B vqsquish=<0|1> -Specify how to keep the quantizer between qmin and qmax (pass 1/2). +Specify how to keep the quantizer between qmin and qmax. .PD 0 .RSs .IPs 0 @@ -9035,6 +9041,10 @@ FIXME: Document this. .B skip_threshold=<0\-1000000> FIXME: Document this. . +.TP +.B "o\ \ \ \ \ \ " +FIXME: undocumented +. . .SS nuv (\-nuvopts) . @@ -10408,6 +10418,10 @@ Maximum length in seconds to analyze the stream properties. Force a specific libavformat demuxer. . .TP +.B "o\ \ \ \ \ \ " +FIXME: undocumented +. +.TP .B probesize=<value> Maximum amount of data to probe during the detection phase. In the case of MPEG-TS this value identifies the maximum number @@ -10484,6 +10498,10 @@ in seconds, between the reference timer of the output stream (SCR) and the decoding timestamp (DTS) for any stream present (demux to decode delay). . +.TP +.B "o\ \ \ \ \ \ " +FIXME: undocumented +. . . .\" -------------------------------------------------------------------------- |