diff options
| author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-15 02:28:06 +0000 |
|---|---|---|
| committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-15 02:28:06 +0000 |
| commit | 4e275431747a086d3f56f9a6c41d306d74477fbd (patch) | |
| tree | 49a3b3bd7b1f83008de8608cc09794bff75741d8 | |
| parent | fe048bd6ddbb80a9645e1fe2663986a0d47bc1a2 (diff) | |
| download | mpv-4e275431747a086d3f56f9a6c41d306d74477fbd.tar.bz2 mpv-4e275431747a086d3f56f9a6c41d306d74477fbd.tar.xz | |
sync to x264 rev263 (RDO)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15725 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 9 | ||||
| -rw-r--r-- | libmpcodecs/ve_x264.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 9cac0b7ef2..5275fd6200 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -8175,7 +8175,7 @@ exhaustive search (very slow) 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 @@ Then finishes the quarterpixel refinement for that type. .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 @@ In the above, "all candidates" doesn't exactly mean all enabled types: .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 --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 5e411bcb23..b55025083e 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -157,7 +157,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, 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}, |