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 64 matching lines @@
 {
     128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128
 };
 
 
 /* Original activity measure from Tim T's code. */
 static unsigned int tt_activity_measure( VP8_COMP *cpi, MACROBLOCK *x )
 {
     unsigned int act;
     unsigned int sse;
+    (void)cpi;
     /* TODO: This could also be done over smaller areas (8x8), but that would
      *  require extensive changes elsewhere, as lambda is assumed to be fixed
      *  over an entire MB in most of the code.
      * Another option is to compute four 8x8 variances, and pick a single
      *  lambda using a non-linear combination (e.g., the smallest, or second
      *  smallest, etc.).
      */
     act =  vp8_variance16x16(x->src.y_buffer,
                     x->src.y_stride, VP8_VAR_OFFS, 0, &sse);
     act = act<<4;
@@ skipping 1047 matching lines @@
 
         int b = 0;
 
         do
         {
             ++ bct[xd->block[b].bmi.mode];
         }
         while (++b < 16);
     }
 
+#else
+    (void)cpi;
 #endif
 
     ++x->ymode_count[m];
     ++x->uv_mode_count[uvm];
 
 }
 
 /* Experimental stub function to create a per MB zbin adjustment based on
  * some previously calculated measure of MB activity.
  */
@@ skipping 250 matching lines @@
             vp8_fix_contexts(xd);
         }
         else
         {
             vp8_stuff_mb(cpi, x, t);
         }
     }
 
     return rate;
 }