libvpx: Pull from upstream

source/libvpx/vp8/encoder/ethreading.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 243 matching lines @@
                             else
                                 cpi->cyclic_refresh_map[map_index + mb_col] = 1;
 
                         }
                     }
 
 #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
                     /* pack tokens for this MB */
                     {
                         int tok_count = tp - tp_start;
-                        pack_tokens(w, tp_start, tok_count);
+                        vp8_pack_tokens(w, tp_start, tok_count);
                     }
 #else
                     cpi->tplist[mb_row].stop = tp;
 #endif
                     /* Increment pointer into gf usage flags structure. */
                     x->gf_active_ptr++;
 
                     /* Increment the activity mask pointers. */
                     x->mb_activity_ptr++;
 
@@ skipping 64 matching lines @@
     z->mv_col_min    = x->mv_col_min;
     z->mv_col_max    = x->mv_col_max;
     z->mv_row_min    = x->mv_row_min;
     z->mv_row_max    = x->mv_row_max;
     */
 
     z->short_fdct4x4     = x->short_fdct4x4;
     z->short_fdct8x4     = x->short_fdct8x4;
     z->short_walsh4x4    = x->short_walsh4x4;
     z->quantize_b        = x->quantize_b;
-    z->quantize_b_pair   = x->quantize_b_pair;
     z->optimize          = x->optimize;
 
     /*
     z->mvc              = x->mvc;
     z->src.y_buffer      = x->src.y_buffer;
     z->src.u_buffer      = x->src.u_buffer;
     z->src.v_buffer      = x->src.v_buffer;
     */
 
     z->mvcost[0] =  x->mvcost[0];
@@ skipping 301 matching lines @@
         sem_destroy(&cpi->h_event_start_lpf);
 
         /* free thread related resources */
         vpx_free(cpi->h_event_start_encoding);
         vpx_free(cpi->h_encoding_thread);
         vpx_free(cpi->mb_row_ei);
         vpx_free(cpi->en_thread_data);
     }
 }
 #endif