Merge "Fix decimation_count in drop_frame"

vp8/encoder/onyx_if.c

@@ -3454,6 +3454,8 @@ static void encode_frame_to_data_rate
         else
             cpi->decimation_count = cpi->decimation_factor;
     }
+    else
+        cpi->decimation_count = 0;
 
     /* Decide how big to make the frame */
     if (!vp8_pick_frame_size(cpi))