# HG changeset patch
# User lorenm
# Date 1118802486 0
# Node ID 35d05a4d14fd916b21d661feab3240a44b2644c6
# Parent  ac7dcf4a1f8ae1c6cb2900486645de7d8f9a7741
sync to x264 rev263 (RDO)

diff -r ac7dcf4a1f8a -r 35d05a4d14fd DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Tue Jun 14 12:48:39 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Jun 15 02:28:06 2005 +0000
@@ -8175,7 +8175,7 @@
 radius of exhaustive or multi-hexagon motion search (default: 16)
 .
 .TP
-.B subq=<1\-5>
+.B subq=<1\-6>
 Adjust subpel refinement quality.
 This parameter controls quality versus speed tradeoffs involved in the motion
 estimation decision process.
@@ -8200,7 +8200,10 @@
 .br
 5: Runs best quality quarterpixel precision motion estimation on all
 candidate macroblock types, before selecting the best type.
-(best, default)
+(default)
+.br
+6: Enables rate-distortion optimization of macroblock types in
+I- and P-frames. (best)
 .REss
 In the above, "all candidates" doesn't exactly mean all enabled types:
 4x4, 4x8, 8x4 are tried only if 8x8 is better than 16x16.
@@ -8209,7 +8212,7 @@
 .B (no)chroma_me
 Takes into account chroma information during subpixel motion search
 (default: enabled).
-Requires subq=5.
+Requires subq>=5.
 .
 .TP
 .B chroma_qp_offset=<-12\-12>
diff -r ac7dcf4a1f8a -r 35d05a4d14fd libmpcodecs/ve_x264.c
--- a/libmpcodecs/ve_x264.c	Tue Jun 14 12:48:39 2005 +0000
+++ b/libmpcodecs/ve_x264.c	Wed Jun 15 02:28:06 2005 +0000
@@ -157,7 +157,7 @@
     {"qblur", &qblur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
     {"cplx_blur", &complexity_blur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 999, NULL},
     {"zones", &zones, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 5, NULL},
+    {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL},
     {"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"me_range", &me_range, CONF_TYPE_INT, CONF_RANGE, 4, 64, NULL},
     {"level_idc", &level_idc, CONF_TYPE_INT, CONF_RANGE, 10, 51, NULL},