libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_thread_common.c

 /*
  *  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 364 matching lines @@
     for (j = 0; j < TX_SIZES; j++)
       cm->counts.tx.p32x32[i][j] += counts->tx.p32x32[i][j];
 
     for (j = 0; j < TX_SIZES - 1; j++)
       cm->counts.tx.p16x16[i][j] += counts->tx.p16x16[i][j];
 
     for (j = 0; j < TX_SIZES - 2; j++)
       cm->counts.tx.p8x8[i][j] += counts->tx.p8x8[i][j];
   }
 
+  for (i = 0; i < TX_SIZES; i++)
+    cm->counts.tx.tx_totals[i] += counts->tx.tx_totals[i];
+
   for (i = 0; i < SKIP_CONTEXTS; i++)
     for (j = 0; j < 2; j++)
       cm->counts.skip[i][j] += counts->skip[i][j];
 
   for (i = 0; i < MV_JOINTS; i++)
     cm->counts.mv.joints[i] += counts->mv.joints[i];
 
   for (k = 0; k < 2; k++) {
     nmv_component_counts *comps = &cm->counts.mv.comps[k];
     nmv_component_counts *comps_t = &counts->mv.comps[k];
@@ skipping 14 matching lines @@
     }
 
     for (i = 0; i < MV_OFFSET_BITS; i++)
       for (j = 0; j < 2; j++)
         comps->bits[i][j] += comps_t->bits[i][j];
 
     for (i = 0; i < MV_FP_SIZE; i++)
       comps->fp[i] += comps_t->fp[i];
   }
 }