diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2008-10-02 19:05:35 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2008-10-02 19:05:35 +0000 |
| commit | a5d24133458c790d0c1922346ead9a2a4e59920d (patch) | |
| tree | ef390a0979bd9534e51194d1e03363fd1662a5fa | |
| parent | 3defa81fc4b5134f4969a610fde6c40518f682c9 (diff) | |
| download | ffmpeg-a5d24133458c790d0c1922346ead9a2a4e59920d.tar.gz | |
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%
Originally committed as revision 15523 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/libx264.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 894e614844..4f7280b6d3 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -227,8 +227,6 @@ X264_init(AVCodecContext *avctx) 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; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cf40681759..b79d235445 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -711,7 +711,6 @@ static const AVOption options[]={ {"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}, |