aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-07-10 06:47:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-07-10 15:35:15 +0200
commitbbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938 (patch)
tree6879e701344d4364c71b56c3af06fccf9a70fc46 /libavcodec
parent7e7168b82d0c42ba6895d4ea95da0c7da0f20573 (diff)
downloadffmpeg-bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938.tar.gz
hevc: derive partially amvp list
When the candidate has been found, no need to derive others. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/hevc_mvs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index 032b8b0569..5b013a7290 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -720,6 +720,11 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW,
availableFlagLXA0 = MP_MX_LT(A1, pred_flag_index_l1, mxA);
}
+ if(availableFlagLXA0 && !mvp_lx_flag) {
+ mv->mv[LX] = mxA;
+ return;
+ }
+
// B candidates
// above right spatial merge candidate
xB0 = x0 + nPbW;