[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.23,1.24

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

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

Modified Files:
	ve_x264.c 
Log Message:
remove x264 option "cabacidc", because the default is always best.


Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ve_x264.c	14 Mar 2005 23:26:11 -0000	1.23
+++ ve_x264.c	13 Apr 2005 19:10:29 -0000	1.24
@@ -72,7 +72,6 @@
 static int deblockalpha = 0;
 static int deblockbeta = 0;
 static int cabac = 1;
-static int cabacidc = -1;
 static int p4x4mv = 0;
 static int p8x8mv = 1;
 static int b8x8mv = 1;
@@ -117,7 +116,6 @@
     {"deblockbeta", &deblockbeta, CONF_TYPE_INT, CONF_RANGE, -6, 6, NULL},
     {"cabac", &cabac, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"nocabac", &cabac, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-    {"cabacidc", &cabacidc, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL},
     {"4x4mv", &p4x4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"no4x4mv", &p4x4mv, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"8x8mv", &p8x8mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -173,7 +171,6 @@
     mod->param.i_deblocking_filter_alphac0 = deblockalpha;
     mod->param.i_deblocking_filter_beta = deblockbeta;
     mod->param.b_cabac = cabac;
-    mod->param.i_cabac_init_idc = cabacidc;
 
     mod->param.rc.i_qp_constant = qp_constant;
     if(qp_min > qp_constant)