[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.49,1.50

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r503 (dct_decimate)
patch by Guillaume Poirier.



Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ve_x264.c	21 Mar 2006 21:26:40 -0000	1.49
+++ ve_x264.c	22 Apr 2006 19:30:57 -0000	1.50
@@ -104,6 +104,7 @@
 static int me_range = 16;
 static int trellis = 1;
 static int fast_pskip = 1;
+static int dct_decimate = 1;
 static int noise_reduction = 0;
 static int threads = 1;
 static int level_idc = 51;
@@ -192,6 +193,8 @@
     {"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},
+    {"dct_decimate", &dct_decimate, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"nodct_decimate", &dct_decimate, 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},
@@ -303,6 +306,7 @@
     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.b_dct_decimate = dct_decimate;
     mod->param.analyse.i_noise_reduction = noise_reduction;
     mod->param.analyse.b_bframe_rdo = bframe_rdo;