# HG changeset patch # User diego # Date 1098150375 0 # Node ID b3dda9a5176079b8d2410f6aa3c99da4c5ccc6a8 # Parent f0b52b481366e207873586e04e62a5f77e2c37e0 Spelling/wording/clarity improvements and bug fixes. diff -r f0b52b481366 -r b3dda9a51760 DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Tue Oct 19 01:36:53 2004 +0000 +++ b/DOCS/man/en/mplayer.1 Tue Oct 19 01:46:15 2004 +0000 @@ -246,7 +246,7 @@ .IPs T\ \ \ \ Toggle stay-on-top (also see \-ontop). .IPs "w and e" -Decrease/\:increase pan and scan range. +Decrease/\:increase pan-and-scan range. .IPs o\ \ \ \ Toggle OSD states: none / seek / seek + timer / seek + timer + total time. .IPs d\ \ \ \ @@ -1051,6 +1051,8 @@ .TP .B \-srate Selects the given output sampling rate, resampling if necessary. +The type of resampling can be controlled by the -af-adv option. +The default is fast resampling that may cause distortion. MEncoder passes this value to LAME for resampling. . .TP @@ -1931,7 +1933,7 @@ This option is used to control the dxr2 video output driver. .RSs .IPs ar-mode= -aspect ratio mode (0 = normal, 1 = pan and scan, 2 = letterbox (default)) +aspect ratio mode (0 = normal, 1 = pan-and-scan, 2 = letterbox (default)) .IPs iec958-encoded Set iec958 output mode to encoded. .IPs iec958-decoded @@ -2169,7 +2171,7 @@ . .TP .B \-panscan <0.0\-1.0> -Enables pan and scan functionality (cropping the sides of e.g.\& a 16:9 +Enables pan-and-scan functionality (cropping the sides of e.g.\& a 16:9 movie to make it fit a 4:3 display without black bands). The range controls how much of the image is cropped. Only works with the xv, xmga, mga, gl and xvidix video output drivers. @@ -2553,7 +2555,7 @@ Disabled looks much better with freetype fonts and uses the borders in fullscreen mode. .IPs (no)aspect -Enable or disable aspect scaling and pan and scan support (default: enabled). +Enable or disable aspect scaling and pan-and-scan support (default: enabled). Disabling might increase speed. .RE .PD 1 @@ -3437,8 +3439,8 @@ Specify additional parameters when decoding with XviD. .br .I NOTE: -As decoding with XviD tends to be a bit slower than libavcodec -you might want to use them instead. +As decoding with XviD tends to be slower than with libavcodec +you might want to use libavcodec instead. .sp 1 XviD's internal postprocessing filters: .PD 0 @@ -5054,7 +5056,7 @@ . .TP .B br=<0\-1024> -bitrate in kBit (CBR and ABR only) +bitrate in kbps (CBR and ABR only) . .TP .B q=<0\-9> @@ -5103,8 +5105,8 @@ . .TP .B fast\ \ \ -Switch on faster encoding on subsequent VBR presets modes, results in -slightly lower quality and higher bitrates. +Switch on faster encoding on subsequent VBR presets modes. +This results in slightly lower quality and higher bitrates. . .TP .B highpassfreq= @@ -5159,7 +5161,7 @@ . .TP .B br=<0\-384> (CBR only) -Specify bitrate in kBit. +bitrate in kbps .TP .B mode= (default: mono for 1-channel audio, stereo otherwise) @@ -6326,10 +6328,10 @@ .SS nuv (\-nuvopts) . Nuppel video is based on RTJPEG and LZO. -By default frames are first encoded with RTJPEG and then compressed with LZO. -But both passes can be enabled or not. -So you can in fact output raw i420, LZO compressed i420, RTJPEG, or the -default LZO compressed RTJPEG. +By default frames are first encoded with RTJPEG and then compressed with LZO, +but it is possible to disable either or both of the two passes. +As a result, you can in fact output raw i420, LZO compressed i420, RTJPEG, +or the default LZO compressed RTJPEG. .br .I NOTE: The nuvrec documentation contains some advice and examples about the @@ -6344,11 +6346,11 @@ luminance threshold (default: 1) . .TP -.B lzo \ +.B lzo\ \ \ \ Enable LZO compression (default). . .TP -.B nolzo \ +.B nolzo\ \ Disable LZO compression. . .TP @@ -6357,11 +6359,11 @@ . .TP .B raw \ \ \ -Disable rtjpeg encoding (default). +Disable RTJPEG encoding. . .TP .B rtjpeg\ -Enable rtjpeg encoding. +Enable RTJPEG encoding (default). . . .SS xvidenc (\-xvidencopts) @@ -6836,7 +6838,7 @@ . .TP .B idrint= -One in each I-Frames are IDR-Frames (default: 2). +Make each I-Frame an IDR-Frame (default: 2). In H.264, I-Frames do not necessarily bound a closed GOP because it is allowable for a P-frame to be predicted from more frames than just the one frame before it (also see frameref).