Merge "Fix decimation_count in drop_frame"

diff --cc vp8/encoder/onyx_if.c
index 25fd394,fb01ea7..4a57d3b
--- 1/vp8/encoder/onyx_if.c
--- 2/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++;