[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.36,1.37

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
sync to x264 r334 (crf)



Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ve_x264.c	8 Oct 2005 22:28:27 -0000	1.36
+++ ve_x264.c	24 Oct 2005 04:39:18 -0000	1.37
@@ -60,6 +60,7 @@
 
 static int bitrate = -1;
 static int qp_constant = 26;
+static int rf_constant = 0;
 static int frame_ref = 1;
 static int keyint_max = 250;
 static int keyint_min = 25;
@@ -118,6 +119,8 @@
 m_option_t x264encopts_conf[] = {
     {"bitrate", &bitrate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL},
     {"qp_constant", &qp_constant, CONF_TYPE_INT, CONF_RANGE, 0, 51, NULL},
+    {"qp", &qp_constant, CONF_TYPE_INT, CONF_RANGE, 0, 51, NULL},
+    {"crf", &rf_constant, CONF_TYPE_INT, CONF_RANGE, 1, 50, NULL},
     {"frameref", &frame_ref, CONF_TYPE_INT, CONF_RANGE, 1, 16, NULL},
     {"keyint", &keyint_max, CONF_TYPE_INT, CONF_RANGE, 1, 24000000, NULL},
     {"keyint_min", &keyint_min, CONF_TYPE_INT, CONF_RANGE, 1, 24000000, NULL},
@@ -231,6 +234,7 @@
     mod->param.b_cabac = cabac;
 
     mod->param.rc.i_qp_constant = qp_constant;
+    mod->param.rc.i_rf_constant = rf_constant;
     if(qp_min > qp_constant)
         qp_min = qp_constant;
     if(qp_max < qp_constant)