From 373677f95816924a3790c174e83ec2e378962c44 Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Wed, 23 Jul 2014 18:27:44 +0200 Subject: [PATCH] hevc_mvs: avoid deriving tmvp in amvp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduces on a sequence number of calls from 933685 to 586271. Reviewed-by: Mickaël Raulet Signed-off-by: Michael Niedermayer --- libavcodec/hevc_mvs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 52cfb29fd3..1d4c002a1c 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -751,7 +751,8 @@ scalef: mvpcand_list[numMVPCandLX++] = mxB; //temporal motion vector prediction candidate - if (numMVPCandLX < 2 && s->sh.slice_temporal_mvp_enabled_flag) { + if (numMVPCandLX < 2 && s->sh.slice_temporal_mvp_enabled_flag && + mvp_lx_flag == numMVPCandLX) { Mv mv_col; int available_col = temporal_luma_motion_vector(s, x0, y0, nPbW, nPbH, ref_idx,