changeset 7983:47f50599b368 libavcodec

x264 has removed the b-rdo and bime options, and instead integrated them into the subme number to attempt to reduce the number of unnecessary options. subme now scales up to 9. Patch by Jason Garett-Glaser %darkshikari A gmail P com%
author gpoirier
date Thu, 02 Oct 2008 19:05:35 +0000
parents 98d37cfc40a1
children 24f2b8cc7918
files libx264.c utils.c
diffstat 2 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libx264.c	Thu Oct 02 16:29:15 2008 +0000
+++ b/libx264.c	Thu Oct 02 19:05:35 2008 +0000
@@ -227,8 +227,6 @@
     x4->params.analyse.i_me_range = avctx->me_range;
     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
 
-    x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
-    x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
     x4->params.analyse.b_mixed_references =
         avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
     x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
--- a/utils.c	Thu Oct 02 16:29:15 2008 +0000
+++ b/utils.c	Thu Oct 02 19:05:35 2008 +0000
@@ -711,7 +711,6 @@
 {"dct8x8", "high profile 8x8 transform (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_8X8DCT, INT_MIN, INT_MAX, V|E, "flags2"},
 {"fastpskip", "fast pskip (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|E, "flags2"},
 {"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_AUD, INT_MIN, INT_MAX, V|E, "flags2"},
-{"brdo", "b-frame rate-distortion optimization", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BRDO, INT_MIN, INT_MAX, V|E, "flags2"},
 {"skiprd", "RD optimal MB level residual skipping", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SKIP_RD, INT_MIN, INT_MAX, V|E, "flags2"},
 {"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, 20.0, FLT_MIN, FLT_MAX, V|E},
 {"deblockalpha", "in-loop deblocking filter alphac0 parameter", OFFSET(deblockalpha), FF_OPT_TYPE_INT, DEFAULT, -6, 6, V|E},