diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
commit | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch) | |
tree | 3d4a19a910d34be6ee7cd4841876a4318d5c243d /libmpcodecs/ve_lavc.c | |
parent | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff) | |
parent | 09bf506c34a73d587c999ce161a0714159e1e5b6 (diff) | |
download | mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2 mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz |
Merge svn changes up to r28461
Diffstat (limited to 'libmpcodecs/ve_lavc.c')
-rw-r--r-- | libmpcodecs/ve_lavc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 8ab4cc43d3..606de43a87 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -113,6 +113,7 @@ static int lavc_param_bit_exact = 0; static int lavc_param_aic= 0; static int lavc_param_aiv= 0; static int lavc_param_umv= 0; +static int lavc_param_gmc= 0; static int lavc_param_obmc= 0; static int lavc_param_loop= 0; static int lavc_param_last_pred= 0; @@ -283,6 +284,9 @@ m_option_t lavcopts_conf[]={ #ifdef CODEC_FLAG_CLOSED_GOP {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL}, #endif +#ifdef CODEC_FLAG_GMC + {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, +#endif {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, {"inter_threshold", &lavc_param_inter_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL}, @@ -555,6 +559,7 @@ static int config(struct vf_instance* vf, lavc_venc_context->flags|= lavc_param_ss; lavc_venc_context->flags|= lavc_param_alt; lavc_venc_context->flags|= lavc_param_ilme; + lavc_venc_context->flags|= lavc_param_gmc; #ifdef CODEC_FLAG_CLOSED_GOP lavc_venc_context->flags|= lavc_param_closed_gop; #endif |