Merge commit 'refs/changes/51/351/1' of ssh://review.webmproject.org:29418/libvpx...

diff --combined vp8/encoder/onyx_int.h
index f76d2ef,a09b238..4bf6c9a
--- 1/vp8/encoder/onyx_int.h
--- 2/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@@ -234,17 -234,14 +234,17 @@@ typedef struc
  {
  
      DECLARE_ALIGNED(16, short, Y1quant[QINDEX_RANGE][4][4]);
 +    DECLARE_ALIGNED(16, short, Y1quant_shift[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, Y1zbin[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, Y1round[QINDEX_RANGE][4][4]);
  
      DECLARE_ALIGNED(16, short, Y2quant[QINDEX_RANGE][4][4]);
 +    DECLARE_ALIGNED(16, short, Y2quant_shift[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, Y2zbin[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, Y2round[QINDEX_RANGE][4][4]);
  
      DECLARE_ALIGNED(16, short, UVquant[QINDEX_RANGE][4][4]);
 +    DECLARE_ALIGNED(16, short, UVquant_shift[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, UVzbin[QINDEX_RANGE][4][4]);
      DECLARE_ALIGNED(16, short, UVround[QINDEX_RANGE][4][4]);
  
@@@ -359,9 -356,14 +359,14 @@@
      int gf_bits;                     // Bits for the golden frame or ARF - 2 pass only
      int mid_gf_extra_bits;             // A few extra bits for the frame half way between two gfs.
  
-     int kf_group_bits;                // Projected total bits available for a key frame group of frames
-     int kf_group_error_left;           // Error score of frames still to be coded in kf group
-     int kf_bits;                     // Bits for the key frame in a key frame group - 2 pass only
+     // Projected total bits available for a key frame group of frames
+     long long kf_group_bits;
+ 
+     // Error score of frames still to be coded in kf group
+     long long kf_group_error_left;
+ 
+     // Bits for the key frame in a key frame group - 2 pass only
+     int kf_bits;
  
      int non_gf_bitrate_adjustment;     // Used in the few frames following a GF to recover the extra bits spent in that GF
      int initial_gf_use;               // percentage use of gf 2 frames after gf