[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.27,1.28

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r240 (threads)


Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ve_x264.c	24 May 2005 06:03:37 -0000	1.27
+++ ve_x264.c	29 May 2005 19:05:32 -0000	1.28
@@ -97,6 +97,7 @@
 static int subq = 5;
 static int me_method = 2;
 static int me_range = 16;
+static int threads = 1;
 static int level_idc = 40;
 static int psnr = 0;
 static int log_level = 2;
@@ -151,6 +152,7 @@
     {"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"me_range", &me_range, CONF_TYPE_INT, CONF_RANGE, 4, 64, 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},
     {"nopsnr", &psnr, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"log", &log_level, CONF_TYPE_INT, CONF_RANGE, -1, 3, NULL},
@@ -264,6 +266,7 @@
     mod->param.i_log_level = log_level;
     mod->param.vui.i_sar_width = d_width*height;
     mod->param.vui.i_sar_height = d_height*width;
+    mod->param.i_threads = threads;
 
     switch(outfmt) {
     case IMGFMT_I420: