From 18fe92cd1989cf9e8be6b2adfe099dc1b5fb6d93 Mon Sep 17 00:00:00 2001 From: lorenm Date: Wed, 13 Apr 2005 19:10:29 +0000 Subject: 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 --- libmpcodecs/ve_x264.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libmpcodecs/ve_x264.c') 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) -- cgit v1.2.3