summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer.110
-rw-r--r--libmpcodecs/ve_x264.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 8b08e6340a..a8aa887aa1 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -8951,7 +8951,7 @@ exhaustive search (very slow, and no better than 3)
radius of exhaustive or multi-hexagon motion search (default: 16)
.
.TP
-.B subq=<1\-6>
+.B subq=<1\-7>
Adjust subpel refinement quality.
This parameter controls quality versus speed tradeoffs involved in the motion
estimation decision process.
@@ -8979,7 +8979,9 @@ Runs best quality quarterpixel precision motion estimation on all
candidate macroblock types, before selecting the best type (default).
.IPs 6
Enables rate-distortion optimization of macroblock types in
-I- and P-frames. (best)
+I- and P-frames.
+.IPs 6
+Enables rate-distortion optimization of motion vectors and intra modes. (best)
.RE
.PD 1
.RS
@@ -9003,7 +9005,7 @@ Requires frameref>1.
.TP
.B (no)brdo
Enables rate-distortion optimization of macroblock types in B-frames.
-Requires subq=6.
+Requires subq>=6.
.
.TP
.B (no)bime
@@ -9021,7 +9023,7 @@ disabled
.IPs 1
enabled only for the final encode (default)
.IPs 2
-enabled during all mode decisions (slow, requires subq=6)
+enabled during all mode decisions (slow, requires subq>=6)
.RE
.PD 1
.
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 6b9e382f13..ba03fa4374 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -184,7 +184,7 @@ m_option_t x264encopts_conf[] = {
{"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, 6, NULL},
+ {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 7, NULL},
{"brdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nobrdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},