aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-07-23 18:27:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-23 21:21:49 +0200
commit373677f95816924a3790c174e83ec2e378962c44 (patch)
treea6680f82d6e7308b667475a31d45498d6bbdffda /libavcodec
parentca081217cda87bf8c5a32b0584665bce9b266d95 (diff)
downloadffmpeg-373677f95816924a3790c174e83ec2e378962c44.tar.gz
hevc_mvs: avoid deriving tmvp in amvp
Reduces on a sequence number of calls from 933685 to 586271. Reviewed-by: Mickaƫl Raulet <mraulet@insa-rennes.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/hevc_mvs.c3
1 files changed, 2 insertions, 1 deletions
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,