Merge "Reset Q for key frame when spatial resizing occurs."

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/rdopt.c
index b457f03cb1097d8813db8f621c5216137bb3f6a3,27956b154ba95cfa5ec2413ec91161478806bc61..6a1c4b7064ca9005cb45e6d8ec4d294d5b26ae2c
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -1965,6 -1962,6 +1965,11 @@@ void vp8_rd_pick_inter_mode(VP8_COMP *c
      int intra_rd_penalty =  10* vp8_dc_quant(cpi->common.base_qindex,
                                               cpi->common.y1dc_delta_q);
  
++#if CONFIG_TEMPORAL_DENOISING
++    unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX,
++            best_rd_sse = INT_MAX;
++#endif
++
  #if CONFIG_TEMPORAL_DENOISING
      unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX,
              best_rd_sse = INT_MAX;