libvpx: Pull from upstream

source/libvpx/vp8/encoder/firstpass.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 2426 matching lines @@
     this_frame_coded_error = this_frame.coded_error;
 
     /* keyframe and section processing ! */
     if (cpi->twopass.frames_to_key == 0)
     {
         /* Define next KF group and assign bits to it */
         vpx_memcpy(&this_frame_copy, &this_frame, sizeof(this_frame));
         find_next_key_frame(cpi, &this_frame_copy);
 
         /* Special case: Error error_resilient_mode mode does not make much
-         * sense for two pass but with its current meaning but this code is
+         * sense for two pass but with its current meaning this code is
          * designed to stop outlandish behaviour if someone does set it when
          * using two pass. It effectively disables GF groups. This is
-         * temporary code till we decide what should really happen in this
+         * temporary code until we decide what should really happen in this
          * case.
          */
         if (cpi->oxcf.error_resilient_mode)
         {
             cpi->twopass.gf_group_bits = cpi->twopass.kf_group_bits;
             cpi->twopass.gf_group_error_left =
                                   (int)cpi->twopass.kf_group_error_left;
             cpi->baseline_gf_interval = cpi->twopass.frames_to_key;
             cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
             cpi->source_alt_ref_pending = 0;
@@ skipping 305 matching lines @@
         kf_group_err += calculate_modified_err(cpi, this_frame);
 
         /* These figures keep intra and coded error counts for all frames
          * including key frames in the group. The effect of the key frame
          * itself can be subtracted out using the first_frame data
          * collected above
          */
         kf_group_intra_err += this_frame->intra_error;
         kf_group_coded_err += this_frame->coded_error;
 
-        /* load a the next frame's stats */
+        /* Load the next frame's stats. */
         vpx_memcpy(&last_frame, this_frame, sizeof(*this_frame));
         input_stats(cpi, this_frame);
 
         /* Provided that we are not at the end of the file... */
         if (cpi->oxcf.auto_key
             && lookup_next_frame_stats(cpi, &next_frame) != EOF)
         {
             /* Normal scene cut check */
             if ( ( i >= MIN_GF_INTERVAL ) &&
                  test_candidate_kf(cpi, &last_frame, this_frame, &next_frame) )
@@ skipping 571 matching lines @@
         }
 
         if ((cpi->common.Width != new_width) || (cpi->common.Height != new_height))
         {
             cpi->common.Width = new_width;
             cpi->common.Height = new_height;
             vp8_alloc_compressor_data(cpi);
         }
     }
 }