diff options
| author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-04 13:11:01 +0000 |
|---|---|---|
| committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-04 13:11:01 +0000 |
| commit | 8f11e599c4d9dd210e01401e27a858319671d850 (patch) | |
| tree | 5a789b27377514e73e5c0ca4321c514180cda906 /libmpcodecs | |
| parent | ad602d546237e85e89d80bcf920368be3a4229e7 (diff) | |
| download | mpv-8f11e599c4d9dd210e01401e27a858319671d850.tar.bz2 mpv-8f11e599c4d9dd210e01401e27a858319671d850.tar.xz | |
sync to x264 r150: new option 'b_pyramid'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14917 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_x264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 06d5512fba..24c436f1e5 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -67,6 +67,7 @@ static int scenecut_threshold = 40; static int bframe = 0; static int bframe_adaptive = 1; static int bframe_bias = 0; +static int bframe_pyramid = 0; static int deblock = 1; static int deblockalpha = 0; static int deblockbeta = 0; @@ -106,6 +107,8 @@ m_option_t x264encopts_conf[] = { {"b_adapt", &bframe_adaptive, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nob_adapt", &bframe_adaptive, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"b_bias", &bframe_bias, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, + {"b_pyramid", &bframe_pyramid, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nob_pyramid", &bframe_pyramid, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"deblock", &deblock, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nodeblock", &deblock, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"deblockalpha", &deblockalpha, CONF_TYPE_INT, CONF_RANGE, -6, 6, NULL}, @@ -160,6 +163,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, mod->param.i_bframe = bframe; mod->param.b_bframe_adaptive = bframe_adaptive; mod->param.i_bframe_bias = bframe_bias; + mod->param.b_bframe_pyramid = bframe_pyramid; mod->param.b_deblocking_filter = deblock; mod->param.i_deblocking_filter_alphac0 = deblockalpha; mod->param.i_deblocking_filter_beta = deblockbeta; |