diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 7cce15de81e1f4b0753e93192bf6609094bfc333..f6145c5aaa9661eb73f11f908981286e7de4d880 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -4026,7 +4026,7 @@ int vp9_set_roimap(VP9_PTR comp, unsigned char *map, unsigned int rows, // Activate segmentation. vp9_enable_segmentation((VP9_PTR)cpi); - // Set up the quan, LF and breakout threshold segment data + // Set up the quant, LF and breakout threshold segment data for (i = 0; i < MAX_SEGMENTS; i++) { feature_data[SEG_LVL_ALT_Q][i] = delta_q[i]; feature_data[SEG_LVL_ALT_LF][i] = delta_lf[i]; @@ -4046,7 +4046,7 @@ int vp9_set_roimap(VP9_PTR comp, unsigned char *map, unsigned int rows, vp9_disable_segfeature(seg, i, SEG_LVL_ALT_LF); } - // Initialise the feature data structure + // Initialize the feature data structure // SEGMENT_DELTADATA 0, SEGMENT_ABSDATA 1 vp9_set_segment_data((VP9_PTR)cpi, &feature_data[0][0], SEGMENT_DELTADATA); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 645b5c53baac406953f479ec54214271c765949f..85b67cc4a4994ff1fc5d1d2e462297bc04da50ee 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1182,9 +1182,8 @@ static int64_t rd_pick_intra_sub_8x8_y_mode(VP9_COMP * const cpi, } this_rd = rd_pick_intra4x4block(cpi, mb, i, &best_mode, bmode_costs, - t_above + idx, t_left + idy, - &r, &ry, &d, bsize, - best_rd - total_rd); + t_above + idx, t_left + idy, &r, &ry, &d, + bsize, best_rd - total_rd); if (this_rd >= best_rd - total_rd) return INT64_MAX; diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c index 25920406549fef15b67f4114422b3f736253d08b..a89e29d868be585a683fc25f69cf344e7faac832 100644 --- a/vpx_scale/generic/yv12config.c +++ b/vpx_scale/generic/yv12config.c @@ -192,7 +192,7 @@ int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, ybf->alpha_buffer = ybf->buffer_alloc + yplane_size + 2 * uvplane_size + (alpha_border_h * alpha_stride) + alpha_border_w; #endif - ybf->corrupted = 0; /* assume not currupted by errors */ + ybf->corrupted = 0; /* assume not corrupted by errors */ return 0; } return -2;