Merge "vp10_highbd_quantize_fp: use const consistently" into nextgenv2

vp10/encoder/quantize.c

@@ -982,7 +982,7 @@ void vp10_highbd_quantize_fp_c(const tran_low_t *coeff_ptr,
                               const int16_t *dequant_ptr,
                               uint16_t *eob_ptr,
                               const int16_t *scan,
-                              const int16_t *iscan, const int log_scale) {
+                              const int16_t *iscan, int log_scale) {
   int i;
   int eob = -1;
   const int scale = 1 << log_scale;
@@ -1069,7 +1069,7 @@ void vp10_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
                               tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
                               const int16_t *dequant_ptr,
                               uint16_t *eob_ptr, const int16_t *scan,
-                              const int16_t *iscan, const int log_scale) {
+                              const int16_t *iscan, int log_scale) {
   int i, non_zero_count = (int)n_coeffs, eob = -1;
   int zbins[2] = {zbin_ptr[0], zbin_ptr[1]};
   int round[2] = {round_ptr[0], round_ptr[1]};

vp10/encoder/x86/vp10_highbd_quantize_sse4.c

@@ -119,7 +119,7 @@ void vp10_highbd_quantize_fp_sse4_1(const tran_low_t *coeff_ptr,
                                     uint16_t *eob_ptr,
                                     const int16_t *scan,
                                     const int16_t *iscan,
-                                    const int log_scale) {
+                                    int log_scale) {
   __m128i coeff[2], qcoeff[2], dequant[2], qparam[3], coeff_sign;
   __m128i eob = _mm_setzero_si128();
   const tran_low_t *src = coeff_ptr;