[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.749,1.750

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/DOCS/man/en
In directory mail:/var2/tmp/cvs-serv32087/DOCS/man/en

Modified Files:
	mplayer.1 
Log Message:
Sws default setting correction, and random wordings


Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- mplayer.1	27 Sep 2004 09:21:38 -0000	1.749
+++ mplayer.1	27 Sep 2004 19:03:48 -0000	1.750
@@ -3337,11 +3337,11 @@
 .PD 0
 .RSs
 .IPs 0
-fast bilinear (default)
+fast bilinear
 .IPs 1
 bilinear
 .IPs 2
-bicubic (good quality)
+bicubic (good quality) (default)
 .IPs 3
 experimental
 .IPs 4
@@ -5887,7 +5887,7 @@
 .sp 1
 .I NOTE:
 This setting does not have the same effect as using a custom matrix that
-whould compress high frequencies harder, as scplx_mask will reduce the
+would compress high frequencies harder, as scplx_mask will reduce the
 quality of P blocks even if only DC is changing.
 The result of scplx_mask will probably not look as good.
 .
@@ -6773,20 +6773,13 @@
 This is required if you want a CBR (constant bitrate) encode.
 .
 .TP
-.B iframe=<value>
+.B keyint=<value>
 Sets maximum interval between I frames.
 Larger values save bits, thus improve quality, at the cost of seeking
-precision (default: 60).
+precision (default: 250).
 .
 .TP
-.B frameref=<1\-15>
-Number of previous frames used as predictors in a P frame (default: 1).
-This is effective in Anime, but seems to make little difference in
-live-action source material.
-Some decoders are unable to deal with large frameref values.
-.
-.TP
-.B idrframe=<value>
+.B idrint=<value>
 Each <value> I-Frames are IDR-Frames (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
@@ -6796,11 +6789,18 @@
 prior to the IDR-Frame.
 .
 .TP
-.B bframe=<value>
-number of B-Frames between I- and P-Frames (default: 0)
+.B frameref=<1\-15>
+Number of previous frames used as predictors in a P frame (default: 1).
+This is effective in Anime, but seems to make little difference in
+live-action source material.
+Some decoders are unable to deal with large frameref values.
+.
+.TP
+.B bframes=<0\-16>
+number of consecutive B-Frames between I- and P-Frames (default: 0)
 .
 .TP
-.B deblock=<0|1>
+.B deblock | nodeblock
 Use deblocking filter (default: on).
 As it takes very little time compared to its quality gain, it's not
 recommend to disable it.
@@ -6827,10 +6827,10 @@
 Affects the maximum allowed gradient within two adjacent blocks.
 .
 .TP
-.B cabac\ \ \ 
-Use CABAC (Context-Adaptive Binary Arithmetic Coding).
-Slows down encoding but should save 10-15% of the bits.
-Unless you are looking for speed, you should activate it.
+.B cabac | nocabac
+Use CABAC (Context-Adaptive Binary Arithmetic Coding) (default: on).
+Slightly slows down encoding and decoding, but should save 10-15% bitrate.
+Unless you are looking for speed, you should not disable it.
 .
 .TP
 .B cabacidc=<value>
@@ -6850,7 +6850,7 @@
 .REss
 .
 .TP
-.B qp_constant=<2\-51>
+.B qp_constant=<1\-51>
 This selects the quantizer to use.
 20\-40 is a useful range (default: 26).
 Lower values result in better fidelity, but higher bitrates.
@@ -6861,11 +6861,11 @@
 Useful quantizers in H.264 tend to be very large compared to MPEG[124].
 .
 .TP
-.B qp_min=<2\-51> (CBR only)
+.B qp_min=<1\-51> (CBR or 2 pass)
 Minimum quantizer, 15\-35 seems to be a useful range (default: 10).
 .
 .TP
-.B qp_max=<2\-51>  (CBR only)
+.B qp_max=<1\-51> (CBR or 2 pass)
 maximum quantizer (default: 51)
 .
 .TP
@@ -6915,7 +6915,7 @@
 higher values force it to vary more smoothly.
 .
 .TP
-.B fullinter
+.B fullinter | nofullinter
 Use all available interframe macroblock types (i16x16, i4x4, p16x16-4x4)
 The idea is to find the type and size that best describe a certain area
 of the picture, i.e.\& very effective for Anime, which usually contains
@@ -6924,22 +6924,6 @@
 it with care.
 .
 .TP
-.B log=<-1\-3>
-Adjust the amount of logging info printed to the screen.
-.RSs
--1: none
-.br
- 0: Print errors only.
-.br
- 1: warnings
-.br
- 2: PSNR, encoding times, and other analysis stats when the encode finishes
-(default)
-.br
- 3: PSNR, QP, frametype, size, and other stats for every frame
-.REss
-.
-.TP
 .B subq=<0\-5>
 Adjust subpel refinement quality.
 This parameter controls quality versus speed tradeoffs involved in the motion
@@ -6960,8 +6944,24 @@
 .REss
 .
 .TP
-.B psnr\ \ \ 
-Print signal-to-noise ratio statistics.
+.B log=<-1\-3>
+Adjust the amount of logging info printed to the screen.
+.RSs
+-1: none
+.br
+ 0: Print errors only.
+.br
+ 1: warnings
+.br
+ 2: PSNR, encoding times, and other analysis stats when the encode finishes
+(default)
+.br
+ 3: PSNR, QP, frametype, size, and other stats for every frame
+.REss
+.
+.TP
+.B psnr | nopsnr
+Print signal-to-noise ratio statistics (default: off).
 .
 .
 .\" --------------------------------------------------------------------------