Mercurial > mplayer.hg
diff libmpcodecs/ve_x264.c @ 16712:2059bee8c11c
sync to x264 r318 (mixed_refs)
author | lorenm |
---|---|
date | Sat, 08 Oct 2005 22:28:27 +0000 |
parents | e054a3c93a26 |
children | cbd11ea4d424 |
line wrap: on
line diff
--- a/libmpcodecs/ve_x264.c Sat Oct 08 20:43:41 2005 +0000 +++ b/libmpcodecs/ve_x264.c Sat Oct 08 22:28:27 2005 +0000 @@ -81,6 +81,7 @@ static int direct_pred = X264_DIRECT_PRED_TEMPORAL; static int weight_b = 0; static int chroma_me = 1; +static int mixed_references = 0; static int chroma_qp_offset = 0; static float ip_factor = 1.4; static float pb_factor = 1.3; @@ -150,6 +151,8 @@ {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"chroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nochroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"mixed_refs", &mixed_references, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nomixed_refs", &mixed_references, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"chroma_qp_offset", &chroma_qp_offset, CONF_TYPE_INT, CONF_RANGE, -12, 12, NULL}, {"ip_factor", &ip_factor, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL}, {"pb_factor", &pb_factor, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL}, @@ -281,6 +284,7 @@ mod->param.analyse.b_weighted_bipred = weight_b; mod->param.analyse.i_chroma_qp_offset = chroma_qp_offset; mod->param.analyse.b_chroma_me = chroma_me; + mod->param.analyse.b_mixed_references = mixed_references; mod->param.i_width = width; mod->param.i_height = height;