From: Scott LaVarnway <slavarnway@google.com>
Date: Tue, 13 Sep 2011 15:46:33 +0000 (-0400)
Subject: Fixed encoder crash
X-Git-Tag: v1.0.0~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bc7b3a68e8c9098d8c8b21dae7c5cabde030e46;p=libvpx

Fixed encoder crash

caused by the "Removed bmi copy to/from BLOCKD" commit.

Change-Id: I9fae71bdc34c8ecc07bb81cd3ccf498b91ce3ec7
---

diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index 1a37f03b9..c4e12ff02 100644
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -232,10 +232,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
                     // Increment the activity mask pointers.
                     x->mb_activity_ptr++;
 
-                    /* save the block info */
-                    for (i = 0; i < 16; i++)
-                        xd->mode_info_context->bmi[i] = xd->block[i].bmi;
-
                     // adjust to the next column of macroblocks
                     x->src.y_buffer += 16;
                     x->src.u_buffer += 8;
@@ -457,6 +453,9 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi,
 
         setup_mbby_copy(&mbr_ei[i].mb, x);
 
+        mbd->fullpixel_mask = 0xffffffff;
+        if(cm->full_pixel)
+            mbd->fullpixel_mask = 0xfffffff8;
     }
 }