Merge "Cleanup typos, remove unnecessary lines, replace switch"

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index 7cc758d480a3e2b762602dcdc45ac7659828086a,7d82f18e553fdf7f477951b72cd751c32e6638d9..4e9621065874cbf50bb7a2f9af6bd122e77c528a
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -1396,9 -1406,9 +1397,9 @@@ static int64_t rd_pick_intra_sby_mode(V
        txfm_cache[i] = INT64_MAX;
    }
  
-   /* Y Search for 32x32 intra prediction mode */
+   /* Y Search for intra prediction mode */
    for (mode = DC_PRED; mode <= TM_PRED; mode++) {
 -    int64_t local_txfm_cache[NB_TXFM_MODES];
 +    int64_t local_txfm_cache[TX_MODES];
      MODE_INFO *const mic = xd->mode_info_context;
      const int mis = xd->mode_info_stride;