Mercurial > mplayer.hg
changeset 17268:2ec81c50a763
sync to x264 r390 (bime)
| author | lorenm |
|---|---|
| date | Fri, 30 Dec 2005 05:15:27 +0000 |
| parents | 123b780115e7 |
| children | 0ddf20d9495e |
| files | DOCS/man/en/mplayer.1 configure libmpcodecs/ve_x264.c |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Fri Dec 30 05:08:37 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Dec 30 05:15:27 2005 +0000 @@ -8859,6 +8859,12 @@ Requires subq=6. . .TP +.B (no)bime +Refine the two motion vectors used in bidirectional macroblocks, +rather than re-using vectors from the forward and backward searches. +This option has no effect without B-frames. +. +.TP .B trellis=<0\-2> rate-distortion optimal quantization .PD 0
--- a/configure Fri Dec 30 05:08:37 2005 +0000 +++ b/configure Fri Dec 30 05:15:27 2005 +0000 @@ -6265,7 +6265,7 @@ cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 40 +#if X264_BUILD < 43 #error We do not support old versions of x264. Get the latest from SVN. #endif int main(void) { x264_encoder_open((void*)0); return 0; }
--- a/libmpcodecs/ve_x264.c Fri Dec 30 05:08:37 2005 +0000 +++ b/libmpcodecs/ve_x264.c Fri Dec 30 05:15:27 2005 +0000 @@ -101,6 +101,7 @@ static char *zones = NULL; static int subq = 5; static int bframe_rdo = 0; +static int bidir_me = 0; static int me_method = 2; static int me_range = 16; static int trellis = 1; @@ -154,6 +155,8 @@ {"direct_pred", &direct_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"weight_b", &weight_b, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"bime", &bidir_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nobime", &bidir_me, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"chroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nochroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"mixed_refs", &mixed_references, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -292,6 +295,7 @@ mod->param.analyse.i_direct_mv_pred = direct_pred; mod->param.analyse.b_weighted_bipred = weight_b; mod->param.analyse.i_chroma_qp_offset = chroma_qp_offset; + mod->param.analyse.b_bidir_me = bidir_me; mod->param.analyse.b_chroma_me = chroma_me; mod->param.analyse.b_mixed_references = mixed_references; mod->param.analyse.i_trellis = trellis;