summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-13 19:10:29 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-13 19:10:29 +0000
commit18fe92cd1989cf9e8be6b2adfe099dc1b5fb6d93 (patch)
treec7275cb3e4de85d36a2f9416b163dc72af7ba08b /libmpcodecs
parent264c7b00870d6b14731519b974f7e2edba4aedeb (diff)
downloadmpv-18fe92cd1989cf9e8be6b2adfe099dc1b5fb6d93.tar.bz2
mpv-18fe92cd1989cf9e8be6b2adfe099dc1b5fb6d93.tar.xz
remove x264 option "cabacidc", because the default is always best.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15150 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index c7e6bf5e65..88de7c88bf 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -72,7 +72,6 @@ static int deblock = 1;
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 @@ m_option_t x264encopts_conf[] = {
{"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 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
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)