[SCM] libav/experimental: hevc: derive partially amvp list

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3505b19652ea34089a4cd08d4d3358fcc0a3db8b
Author: Christophe Gisquet <christophe.gisquet at gmail.com>
Date:   Fri Aug 8 18:21:00 2014 +0000

    hevc: derive partially amvp list
    
    When the candidate has been found, no need to derive others.
    
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index 7fa418b..12823c2 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;

-- 
Libav/FFmpeg packaging