libvpx: Pull from upstream

source/libvpx/vp8/encoder/encodeframe.c

 /*
  *  Copyright (c) 2010 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 682 matching lines @@
         xd->fullpixel_mask = 0xfffffff8;
 
     vp8_zero(x->coef_counts);
     vp8_zero(x->ymode_count);
     vp8_zero(x->uv_mode_count)
     x->prediction_error = 0;
     x->intra_error = 0;
     vp8_zero(x->count_mb_ref_frame_usage);
 }
 
+#if CONFIG_MULTITHREAD
 static void sum_coef_counts(MACROBLOCK *x, MACROBLOCK *x_thread)
 {
     int i = 0;
     do
     {
         int j = 0;
         do
         {
             int k = 0;
             do
             {
                 /* at every context */
 
                 /* calc probs and branch cts for this frame only */
                 int t = 0;      /* token/prob index */
 
                 do
                 {
                     x->coef_counts [i][j][k][t] +=
                         x_thread->coef_counts [i][j][k][t];
                 }
                 while (++t < ENTROPY_NODES);
             }
             while (++k < PREV_COEF_CONTEXTS);
         }
         while (++j < COEF_BANDS);
     }
     while (++i < BLOCK_TYPES);
 }
+#endif  // CONFIG_MULTITHREAD
 
 void vp8_encode_frame(VP8_COMP *cpi)
 {
     int mb_row;
     MACROBLOCK *const x = & cpi->mb;
     VP8_COMMON *const cm = & cpi->common;
     MACROBLOCKD *const xd = & x->e_mbd;
     TOKENEXTRA *tp = cpi->tok;
     int segment_counts[MAX_MB_SEGMENTS];
     int totalrate;
@@ skipping 178 matching lines @@
                 for(c_idx = 0; c_idx < MAX_ERROR_BINS; c_idx++)
                     cpi->mb.error_bins[c_idx] +=
                         cpi->mb_row_ei[i].mb.error_bins[c_idx];
 
                 /* add up counts for each thread */
                 sum_coef_counts(x, &cpi->mb_row_ei[i].mb);
             }
 
         }
         else
-#endif
+#endif  // CONFIG_MULTITHREAD
         {
 
             /* for each macroblock row in image */
             for (mb_row = 0; mb_row < cm->mb_rows; mb_row++)
             {
                 vp8_zero(cm->left_context)
 
 #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
                 tp = cpi->tok;
 #endif
@@ skipping 474 matching lines @@
             vp8_fix_contexts(xd);
         }
         else
         {
             vp8_stuff_mb(cpi, x, t);
         }
     }
 
     return rate;
 }