From 457b63508d680d4b7ef60040e811715967f83987 Mon Sep 17 00:00:00 2001
From: lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 30 Dec 2005 05:15:27 +0000
Subject: sync to x264 r390 (bime)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17269 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/ve_x264.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 3fd6d77eb0..e2c68d9282 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -101,6 +101,7 @@ static char *rc_eq = "blurCplx^(1-qComp)";
 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 @@ m_option_t x264encopts_conf[] = {
     {"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 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
     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;
-- 
cgit v1.2.3