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 556 matching lines @@
 
             }
         }
 
         cpi->tplist[mb_row].stop = *tp;
 
 #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);
         }
 #endif
         /* Increment pointer into gf usage flags structure. */
         x->gf_active_ptr++;
 
         /* Increment the activity mask pointers. */
         x->mb_activity_ptr++;
 
         /* adjust to the next column of macroblocks */
         x->src.y_buffer += 16;
@@ skipping 657 matching lines @@
 #endif
 
     if (cpi->sf.RD)
     {
         int zbin_mode_boost_enabled = x->zbin_mode_boost_enabled;
 
         /* Are we using the fast quantizer for the mode selection? */
         if(cpi->sf.use_fastquant_for_pick)
         {
             x->quantize_b      = vp8_fast_quantize_b;
-            x->quantize_b_pair = vp8_fast_quantize_b_pair;
 
             /* the fast quantizer does not use zbin_extra, so
              * do not recalculate */
             x->zbin_mode_boost_enabled = 0;
         }
         vp8_rd_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
                                &distortion, &intra_error, mb_row, mb_col);
 
         /* switch back to the regular quantizer for the encode */
         if (cpi->sf.improved_quant)
         {
             x->quantize_b      = vp8_regular_quantize_b;
-            x->quantize_b_pair = vp8_regular_quantize_b_pair;
         }
 
         /* restore cpi->zbin_mode_boost_enabled */
         x->zbin_mode_boost_enabled = zbin_mode_boost_enabled;
 
     }
     else
     {
         vp8_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
                             &distortion, &intra_error, mb_row, mb_col);
@@ skipping 129 matching lines @@
             vp8_fix_contexts(xd);
         }
         else
         {
             vp8_stuff_mb(cpi, x, t);
         }
     }
 
     return rate;
 }