[FFmpeg-cvslog] vp9: fix bug in updating of coef probabilities with parallelmode=1.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Mon Dec 23 21:41:35 2013 -0500| [4a55bffad32e266d96b72b40cf1a7d085e7fce93] | committer: Michael Niedermayer

vp9: fix bug in updating of coef probabilities with parallelmode=1.

Fixes trac ticket 3228.

Reviewed-by: Clément Bœsch <u at pkh.me>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/vp9.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index a52924c..88c5bc6 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -3547,13 +3547,16 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
     if (s->refreshctx && s->parallelmode) {
         int j, k, l, m;
 
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < 4; i++) {
             for (j = 0; j < 2; j++)
                 for (k = 0; k < 2; k++)
                     for (l = 0; l < 6; l++)
                         for (m = 0; m < 6; m++)
                             memcpy(s->prob_ctx[s->framectxid].coef[i][j][k][l][m],
                                    s->prob.coef[i][j][k][l][m], 3);
+            if (s->txfmmode == i)
+                break;
+        }
         s->prob_ctx[s->framectxid].p = s->prob.p;
         ff_thread_finish_setup(ctx);
     }