diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-09-25 15:42:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-25 15:42:48 -0700 |
| commit | 9cd14ea6ed8328d6623bd2780f1c272ab8e8c727 (patch) | |
| tree | 3653d36e43e5a7a7665b6d18e455f96b433116a1 | |
| parent | 682c27239f711cb0dbdcb329d4070f62c76f1f5f (diff) | |
| parent | 12d57a9409ba3af72eb2a24e602f51efc003ada3 (diff) | |
| download | libvpx-9cd14ea6ed8328d6623bd2780f1c272ab8e8c727.tar libvpx-9cd14ea6ed8328d6623bd2780f1c272ab8e8c727.tar.gz libvpx-9cd14ea6ed8328d6623bd2780f1c272ab8e8c727.tar.bz2 libvpx-9cd14ea6ed8328d6623bd2780f1c272ab8e8c727.zip | |
Merge "Removing redundant 'extern' keyword."
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_quantize.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_quantize.h | 10 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.h | 4 |
4 files changed, 11 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 9b20dafde..aea1508ef 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -712,9 +712,8 @@ void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x); void vp9_set_speed_features(VP9_COMP *cpi); -extern int vp9_calc_ss_err(YV12_BUFFER_CONFIG *source, - YV12_BUFFER_CONFIG *dest); +int vp9_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest); -extern void vp9_alloc_compressor_data(VP9_COMP *cpi); +void vp9_alloc_compressor_data(VP9_COMP *cpi); #endif // VP9_ENCODER_VP9_ONYX_INT_H_ diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c index 6c8b2a04b..05e893ee9 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -337,10 +337,10 @@ void vp9_frame_init_quantizer(VP9_COMP *cpi) { vp9_mb_init_quantizer(cpi, &cpi->mb); } -void vp9_set_quantizer(struct VP9_COMP *cpi, int Q) { +void vp9_set_quantizer(struct VP9_COMP *cpi, int q) { VP9_COMMON *cm = &cpi->common; - cm->base_qindex = Q; + cm->base_qindex = q; // if any of the delta_q values are changing update flag will // have to be set. diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h index 3229eaad2..3191c49ae 100644 --- a/vp9/encoder/vp9_quantize.h +++ b/vp9/encoder/vp9_quantize.h @@ -30,14 +30,14 @@ void vp9_regular_quantize_b_8x8(MACROBLOCK *mb, int b_idx, TX_TYPE tx_type, int y_blocks); struct VP9_COMP; -extern void vp9_set_quantizer(struct VP9_COMP *cpi, int Q); +void vp9_set_quantizer(struct VP9_COMP *cpi, int q); -extern void vp9_frame_init_quantizer(struct VP9_COMP *cpi); +void vp9_frame_init_quantizer(struct VP9_COMP *cpi); -extern void vp9_update_zbin_extra(struct VP9_COMP *cpi, MACROBLOCK *x); +void vp9_update_zbin_extra(struct VP9_COMP *cpi, MACROBLOCK *x); -extern void vp9_mb_init_quantizer(struct VP9_COMP *cpi, MACROBLOCK *x); +void vp9_mb_init_quantizer(struct VP9_COMP *cpi, MACROBLOCK *x); -extern void vp9_init_quantizer(struct VP9_COMP *cpi); +void vp9_init_quantizer(struct VP9_COMP *cpi); #endif // VP9_ENCODER_VP9_QUANTIZE_H_ diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h index 473317605..ddda7130c 100644 --- a/vp9/encoder/vp9_ratectrl.h +++ b/vp9/encoder/vp9_ratectrl.h @@ -32,8 +32,8 @@ int vp9_pick_frame_size(VP9_COMP *cpi); double vp9_convert_qindex_to_q(int qindex); int vp9_gfboost_qadjust(int qindex); -extern int vp9_bits_per_mb(FRAME_TYPE frame_type, int qindex, - double correction_factor); +int vp9_bits_per_mb(FRAME_TYPE frame_type, int qindex, + double correction_factor); void vp9_setup_inter_frame(VP9_COMP *cpi); #endif // VP9_ENCODER_VP9_RATECTRL_H_ |