aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-08-08 18:21:00 +0000
committerAnton Khirnov <anton@khirnov.net>2014-08-12 09:58:14 +0000
commit3505b19652ea34089a4cd08d4d3358fcc0a3db8b (patch)
tree5f33aab8508428b8e19c7c7932da1b76d60b6c53 /libavcodec
parent09182b3224370e1d636631e77f201a8388766bd6 (diff)
downloadffmpeg-3505b19652ea34089a4cd08d4d3358fcc0a3db8b.tar.gz
hevc: derive partially amvp list
When the candidate has been found, no need to derive others. Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 7fa418b15b..12823c268f 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -722,6 +722,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;