Merge "Cleanup: removing unused function arguments."

diff --cc vp9/encoder/vp9_encodeframe.c
index 0919dc68028d19abee3f4609efd7e921b3a67f5c,37cce10a70a44fce4fe503839e7d3cbb00ff3ba3..482537837223b15b05c3bad22da59df5db5ead95
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -60,28 -60,11 +60,28 @@@ static void adjust_act_zbin(VP9_COMP *c
   * Eventually this should be replaced by custom no-reference routines,
   *  which will be faster.
   */
 -static const uint8_t VP9_VAR_OFFS[16] = {128, 128, 128, 128, 128, 128, 128, 128,
 -    128, 128, 128, 128, 128, 128, 128, 128};
 +static const uint8_t VP9_VAR_OFFS[64] = {
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128,
 +  128, 128, 128, 128, 128, 128, 128, 128
 +};
 +
 +static unsigned int get_sb_variance(VP9_COMP *cpi, MACROBLOCK *x,
 +                                    BLOCK_SIZE_TYPE bs) {
 +  unsigned int var, sse;
 +  var = cpi->fn_ptr[bs].vf(x->plane[0].src.buf,
 +                           x->plane[0].src.stride,
 +                           VP9_VAR_OFFS, 0, &sse);
 +  return var >> num_pels_log2_lookup[bs];
 +}
  
  // Original activity measure from Tim T's code.
- static unsigned int tt_activity_measure(VP9_COMP *cpi, MACROBLOCK *x) {
+ static unsigned int tt_activity_measure(MACROBLOCK *x) {
    unsigned int act;
    unsigned int sse;
    /* TODO: This could also be done over smaller areas (8x8), but that would