| Index: source/libvpx/vp8/encoder/onyx_int.h
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/onyx_int.h (revision 191025)
|
| +++ source/libvpx/vp8/encoder/onyx_int.h (working copy)
|
| @@ -282,17 +282,17 @@
|
| {
|
|
|
| DECLARE_ALIGNED(16, short, Y1quant[QINDEX_RANGE][16]);
|
| - DECLARE_ALIGNED(16, unsigned char, Y1quant_shift[QINDEX_RANGE][16]);
|
| + DECLARE_ALIGNED(16, short, Y1quant_shift[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, Y1zbin[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, Y1round[QINDEX_RANGE][16]);
|
|
|
| DECLARE_ALIGNED(16, short, Y2quant[QINDEX_RANGE][16]);
|
| - DECLARE_ALIGNED(16, unsigned char, Y2quant_shift[QINDEX_RANGE][16]);
|
| + DECLARE_ALIGNED(16, short, Y2quant_shift[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, Y2zbin[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, Y2round[QINDEX_RANGE][16]);
|
|
|
| DECLARE_ALIGNED(16, short, UVquant[QINDEX_RANGE][16]);
|
| - DECLARE_ALIGNED(16, unsigned char, UVquant_shift[QINDEX_RANGE][16]);
|
| + DECLARE_ALIGNED(16, short, UVquant_shift[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, UVzbin[QINDEX_RANGE][16]);
|
| DECLARE_ALIGNED(16, short, UVround[QINDEX_RANGE][16]);
|
|
|
| @@ -587,7 +587,7 @@
|
| /* Error score of frames still to be coded in kf group */
|
| int64_t kf_group_error_left;
|
| /* Projected Bits available for a group including 1 GF or ARF */
|
| - int gf_group_bits;
|
| + int64_t gf_group_bits;
|
| /* Bits for the golden frame or ARF */
|
| int gf_bits;
|
| int alt_extra_bits;
|
|
|