# HG changeset patch
# User lorenm
# Date 1113419429 0
# Node ID 8319e8b0c437e4e4d7969cb909d1d1f2e2a39ac3
# Parent  067f10ad65386d67ee6cb7cfd914ff9e178bb4df
remove x264 option "cabacidc", because the default is always best.

diff -r 067f10ad6538 -r 8319e8b0c437 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Wed Apr 13 18:53:30 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Apr 13 19:10:29 2005 +0000
@@ -7757,23 +7757,6 @@
 Unless you are looking for decoding speed, you should not disable it.
 .
 .TP
-.B cabacidc=<value>
-Initial value of CABAC IDC.
-The encoder must choose a context for each block it encodes, but for the
-first block in a frame, there are no prior blocks to predict the context.
-Adjusting this may affect bitrate by a fraction of a percent, but it doesn't
-directly affect distortion.
-.RSs
--1: Encoder chooses context, usually 0 (default).
-.br
-0: low complexity
-.br
-1: medium complexity
-.br
-2: high complexity
-.REss
-.
-.TP
 .B qp_min=<1\-51> (CBR or two pass)
 Minimum quantizer, 10\-30 seems to be a useful range (default: 10).
 .
diff -r 067f10ad6538 -r 8319e8b0c437 libmpcodecs/ve_x264.c
--- a/libmpcodecs/ve_x264.c	Wed Apr 13 18:53:30 2005 +0000
+++ b/libmpcodecs/ve_x264.c	Wed Apr 13 19:10:29 2005 +0000
@@ -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)