summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-22 19:30:57 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-22 19:30:57 +0000
commit94b93ccc69d35a23cebcb0d9a92fe511c8dd5457 (patch)
tree508776baf9c32bf87843769cb03950924dd48d60 /libmpcodecs
parent63c70fadf22e5ff7fe551390043bdc0d0b02efce (diff)
downloadmpv-94b93ccc69d35a23cebcb0d9a92fe511c8dd5457.tar.bz2
mpv-94b93ccc69d35a23cebcb0d9a92fe511c8dd5457.tar.xz
sync to x264 r503 (dct_decimate)
patch by Guillaume Poirier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18208 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index c8ad1fdeca..16e3c98627 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -104,6 +104,7 @@ static int me_method = 2;
static int me_range = 16;
static int trellis = 1;
static int fast_pskip = 1;
+static int dct_decimate = 1;
static int noise_reduction = 0;
static int threads = 1;
static int level_idc = 51;
@@ -192,6 +193,8 @@ m_option_t x264encopts_conf[] = {
{"trellis", &trellis, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
{"fast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nofast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 0, NULL},
+ {"dct_decimate", &dct_decimate, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"nodct_decimate", &dct_decimate, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"nr", &noise_reduction, CONF_TYPE_INT, CONF_RANGE, 0, 100000, NULL},
{"level_idc", &level_idc, CONF_TYPE_INT, CONF_RANGE, 10, 51, NULL},
{"threads", &threads, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
@@ -303,6 +306,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
mod->param.analyse.b_mixed_references = mixed_references;
mod->param.analyse.i_trellis = trellis;
mod->param.analyse.b_fast_pskip = fast_pskip;
+ mod->param.analyse.b_dct_decimate = dct_decimate;
mod->param.analyse.i_noise_reduction = noise_reduction;
mod->param.analyse.b_bframe_rdo = bframe_rdo;