summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-22 05:17:17 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-22 05:17:17 +0000
commitc965918454d76a77e2b3d5f0dd91639e82d392b8 (patch)
tree40db1dce396bc2bc62af56ea88274fe83453d8b6 /libmpcodecs
parent7440b82eb787d2b29d36a3e4752b0e0d5074d469 (diff)
downloadmpv-c965918454d76a77e2b3d5f0dd91639e82d392b8.tar.bz2
mpv-c965918454d76a77e2b3d5f0dd91639e82d392b8.tar.xz
sync to x264 r373 (brdo)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17026 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 8d4c499e69..6007792610 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -100,6 +100,7 @@ static float complexity_blur = 20;
static char *rc_eq = "blurCplx^(1-qComp)";
static char *zones = NULL;
static int subq = 5;
+static int bframe_rdo = 0;
static int me_method = 2;
static int me_range = 16;
static int trellis = 1;
@@ -181,6 +182,8 @@ m_option_t x264encopts_conf[] = {
{"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, 6, NULL},
+ {"brdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"nobrdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
{"me_range", &me_range, CONF_TYPE_INT, CONF_RANGE, 4, 64, NULL},
{"trellis", &trellis, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
@@ -292,6 +295,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
mod->param.analyse.b_chroma_me = chroma_me;
mod->param.analyse.b_mixed_references = mixed_references;
mod->param.analyse.i_trellis = trellis;
+ mod->param.analyse.b_bframe_rdo = bframe_rdo;
mod->param.i_width = width;
mod->param.i_height = height;