From: John Koleszar <jkoleszar@google.com>
Date: Mon, 11 Jun 2012 19:02:56 +0000 (-0700)
Subject: Merge "Reset Q for key frame when spatial resizing occurs."
X-Git-Tag: v1.2.0~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71618e542cfa2dbe2569bedd34c3bdc12d9b0060;p=libvpx

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

71618e542cfa2dbe2569bedd34c3bdc12d9b0060
diff --cc vp8/encoder/rdopt.c
index b457f03cb,27956b154..6a1c4b706
--- a/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;