[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.42,1.43

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r398.
patch by Guillaume Poirier.



Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ve_x264.c	30 Dec 2005 05:15:27 -0000	1.42
+++ ve_x264.c	16 Jan 2006 01:37:32 -0000	1.43
@@ -105,6 +105,8 @@
 static int me_method = 2;
 static int me_range = 16;
 static int trellis = 1;
+static int fast_pskip = 1;
+static int noise_reduction = 0;
 static int threads = 1;
 static int level_idc = 51;
 static int psnr = 0;
@@ -190,6 +192,9 @@
     {"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},
+    {"fast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"nofast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 0, NULL},
+    {"nr", &noise_reduction, CONF_TYPE_INT, CONF_RANGE, 0, 100000, NULL},
     {"level_idc", &level_idc, CONF_TYPE_INT, CONF_RANGE, 10, 51, NULL},
     {"threads", &threads, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"psnr", &psnr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -299,6 +304,8 @@
     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_fast_pskip = fast_pskip;
+    mod->param.analyse.i_noise_reduction = noise_reduction;
     mod->param.analyse.b_bframe_rdo = bframe_rdo;
 
     mod->param.i_width = width;