# HG changeset patch
# User gpoirier
# Date 1168166340 0
# Node ID 01bb9c073e77411654da76aec5fab6a1d2490387
# Parent  b11d75b2ebdd4872400ee61587ec8d461bc6b371
clarify a few things about the interaction between *cmp and mbd options
fix encoding example that featured a option that didn't have any effect (because of the interaction mentioned above)

diff -r b11d75b2ebdd -r 01bb9c073e77 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Sat Jan 06 20:21:27 2007 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Jan 07 10:39:00 2007 +0000
@@ -7304,14 +7304,20 @@
 motion estimation search range (default: 0 (unlimited))
 .
 .TP
-.B mbd=<0\-2>
+.B mbd=<0\-2> (see also *cmp, qpel)
 Macroblock decision algorithm (high quality mode), encode each macro
 block in all modes and choose the best.
 This is slow but results in better quality and file size.
+When mbd is set to 1 or 2, the value of mbcmp is ignored when comparing
+macroblocks.
+If any comparison setting (precmp, subcmp, cmp, or mbcmp) is nonzero,
+however, a slower but better half-pel motion search will be used,
+regardless of what mbd is set to.
+If qpel is set, quarter-pel motion search will be used regardless.
 .PD 0
 .RSs
 .IPs 0
-Use mbcmp (default).
+Use comparison function given by mbcmp (default).
 .IPs 1
 Select the MB mode which needs the fewest bits (=vhq).
 .IPs 2
@@ -8118,7 +8124,8 @@
 .
 .TP
 .B mbcmp=<0\-2000>
-Sets the comparison function for the macroblock decision, only used if mbd=0.
+Sets the comparison function for the macroblock decision, has only
+an effect if mbd=0.
 .PD 0
 .RSs
 .IPs "0 (SAD)"
diff -r b11d75b2ebdd -r 01bb9c073e77 DOCS/xml/en/encoding-guide.xml
--- a/DOCS/xml/en/encoding-guide.xml	Sat Jan 06 20:21:27 2007 +0000
+++ b/DOCS/xml/en/encoding-guide.xml	Sun Jan 07 10:39:00 2007 +0000
@@ -2953,13 +2953,13 @@
 We are now ready to do the two pass encode. Pass one:
 <screen>
 mencoder dvd://1 -ofps 24000/1001 -oac copy -o <replaceable>Harry_Potter_2.avi</replaceable> -ovc lavc \
-    -lavcopts vcodec=mpeg4:vbitrate=2400:v4mv:mbd=2:trell:cmp=3:subcmp=3:mbcmp=3:autoaspect:vpass=1 \
+    -lavcopts vcodec=mpeg4:vbitrate=2400:v4mv:mbd=2:trell:cmp=3:subcmp=3:autoaspect:vpass=1 \
     -vf pullup,softskip,crop=720:352:0:62,hqdn3d=2:1:2
 </screen>
 And pass two is the same, except that we specify <option>vpass=2</option>:
 <screen>
 mencoder dvd://1 -ofps 24000/1001 -oac copy -o <replaceable>Harry_Potter_2.avi</replaceable> -ovc lavc \
-    -lavcopts vcodec=mpeg4:vbitrate=2400:v4mv:mbd=2:trell:cmp=3:subcmp=3:mbcmp=3:autoaspect:vpass=2 \
+    -lavcopts vcodec=mpeg4:vbitrate=2400:v4mv:mbd=2:trell:cmp=3:subcmp=3:autoaspect:vpass=2 \
     -vf pullup,softskip,crop=720:352:0:62,hqdn3d=2:1:2
 </screen>
 </para>
@@ -2968,7 +2968,7 @@
 The options <option>v4mv:mbd=2:trell</option> will greatly increase the
 quality at the expense of encoding time. There is little reason to leave
 these options out when the primary goal is quality. The options
-<option>cmp=3:subcmp=3:mbcmp=3</option> select a comparison function that
+<option>cmp=3:subcmp=3</option> select a comparison function that
 yields higher quality than the defaults. You might try experimenting with
 this parameter (refer to the man page for the possible values) as
 different functions can have a large impact on quality depending on the