[FFmpeg-cvslog] hevc: derive partially amvp list

[Christophe Gisquet]

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Thu Jul 10 06:47:53 2014 +0000| [bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938] | committer: Michael Niedermayer

hevc: derive partially amvp list

When the candidate has been found, no need to derive others.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938
---

 libavcodec/hevc_mvs.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index 032b8b0..5b013a7 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;