diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /DOCS | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 12 | ||||
| -rw-r--r-- | DOCS/man/fr/mplayer.1 | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index ec17c3f873..888f3454b4 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -8196,24 +8196,14 @@ the quantizer more over time (slower change). .TP .B vqcomp=<0.0\-1.0> 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. -If vqcomp=0.0, the ratecontrol allocates the same number of bits to each -frame, i.e. strict CBR. .I NOTE: -Those are extreme settings and should never be used. -Perceptual quality will be optimal somewhere in between these two extremes. +Perceptual quality will be optimal somewhere in between the range's extremes. . .TP .B vrc_eq=<equation> main ratecontrol equation .RE .RSs -.IPs "1\ \ \ \ " -constant bitrate -.IPs "tex\ \ " -constant quality .IPs 1+(tex/\:avgTex-1)*qComp approximately the equation of the old ratecontrol code .IPs tex^qComp diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 9479e66411..2b1ebc814f 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r27337 +.\" synced with r27236 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann |