[SCM] libav/experimental: hevc: wait proper position for tmvp

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 14ca0aa69b5d954ce56d0826ab9f1f70e535c92a
Author: Christophe Gisquet <christophe.gisquet at gmail.com>
Date:   Sun Jul 20 09:34:58 2014 +0200

    hevc: wait proper position for tmvp
    
    The position is either rounded or not checked, so delay the wait to
    check the proper value.
    
    Reviewed-by: Mickaël Raulet <mraulet at insa-rennes.fr>
    
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index 89b514f..4d0f302 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -267,13 +267,13 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
     x = x0 + nPbW;
     y = y0 + nPbH;
 
-    ff_thread_await_progress(&ref->tf, y, 0);
     if (tab_mvf &&
         (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) &&
         y < s->sps->height &&
         x < s->sps->width) {
         x                 &= ~15;
         y                 &= ~15;
+        ff_thread_await_progress(&ref->tf, y, 0);
         x_pu               = x >> s->sps->log2_min_pu_size;
         y_pu               = y >> s->sps->log2_min_pu_size;
         temp_col           = TAB_MVF(x_pu, y_pu);
@@ -286,6 +286,7 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
         y                  = y0 + (nPbH >> 1);
         x                 &= ~15;
         y                 &= ~15;
+        ff_thread_await_progress(&ref->tf, y, 0);
         x_pu               = x >> s->sps->log2_min_pu_size;
         y_pu               = y >> s->sps->log2_min_pu_size;
         temp_col           = TAB_MVF(x_pu, y_pu);

-- 
Libav/FFmpeg packaging