Merge "Replacing raster_block with block in the encoder."

diff --cc vp9/encoder/vp9_encodemb.c
index 7afed26d62d7609b60e07d27b511f61163cb114f,c43e96d415a36a0feea66339d4c2fded546cb320..b709848dda5b1014f615a3578e803bed1c6dd487
--- 1/vp9/encoder/vp9_encodemb.c
--- 2/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@@ -136,11 -136,8 +136,10 @@@ static void optimize_b(MACROBLOCK *mb
    const int16_t *scan, *nb;
    const int mul = 1 + (tx_size == TX_32X32);
    uint8_t token_cache[1024];
-   const int ib = txfrm_block_to_raster_block(plane_bsize, tx_size, block);
    const int16_t *dequant_ptr = pd->dequant;
 -  const uint8_t *const band_translate = get_band_translate(tx_size);
 +  const uint8_t *const band_translate = (tx_size == TX_4X4 ?
 +                                         vp9_coefband_trans_4x4 :
 +                                         mb->coefband_trans_8x8plus);
  
    assert((!type && !plane) || (type && plane));
    dqcoeff_ptr = BLOCK_OFFSET(pd->dqcoeff, block);