[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.39,1.40

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv14593/libmpcodecs

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r373 (brdo)



Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ve_x264.c	18 Nov 2005 14:39:22 -0000	1.39
+++ ve_x264.c	22 Nov 2005 05:17:17 -0000	1.40
@@ -100,6 +100,7 @@
 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 @@
     {"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 @@
     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;