From: Yunqing Wang <yunqingwang@google.com>
Date: Fri, 29 Jun 2012 17:57:39 +0000 (-0700)
Subject: Merge "Fix decimation_count in drop_frame"
X-Git-Tag: v1.2.0~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2c5e78ad929d4a6f91895505425b00c5736bd16;p=libvpx

Merge "Fix decimation_count in drop_frame"
---

e2c5e78ad929d4a6f91895505425b00c5736bd16
diff --cc vp8/encoder/onyx_if.c
index 25fd394ca,fb01ea732..4a57d3b27
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -3454,8 -3466,10 +3454,10 @@@ static void encode_frame_to_data_rat
          else
              cpi->decimation_count = cpi->decimation_factor;
      }
+     else
+         cpi->decimation_count = 0;
  
 -    // Decide how big to make the frame
 +    /* Decide how big to make the frame */
      if (!vp8_pick_frame_size(cpi))
      {
          cm->current_video_frame++;