diff options
| author | James Zern <jzern@google.com> | 2016-06-24 21:50:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-24 21:50:45 +0000 |
| commit | efad6feb9a6cce66f849adcdc631becb31376b94 (patch) | |
| tree | 4b54debb8fe1e9d8c5691d91db6625e22047960b /vp9 | |
| parent | 9e5f355daf97217222be25eeb065b05b4fd9e5a4 (diff) | |
| parent | 3b2e2f2f77bf05dbb2c09621b741d3a868d49fa0 (diff) | |
| download | libvpx-efad6feb9a6cce66f849adcdc631becb31376b94.tar libvpx-efad6feb9a6cce66f849adcdc631becb31376b94.tar.gz libvpx-efad6feb9a6cce66f849adcdc631becb31376b94.tar.bz2 libvpx-efad6feb9a6cce66f849adcdc631becb31376b94.zip | |
Merge "cosmetics: Change few types to their posix version"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_seg_common.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index 7ea7c3dd7..99a9440c1 100644 --- a/vp9/common/vp9_seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -46,7 +46,7 @@ struct segmentation { vpx_prob pred_probs[PREDICTION_PROBS]; int16_t feature_data[MAX_SEGMENTS][SEG_LVL_MAX]; - unsigned int feature_mask[MAX_SEGMENTS]; + uint32_t feature_mask[MAX_SEGMENTS]; int aq_av_offset; }; diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index b65dfa8a6..709f7c684 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -408,7 +408,7 @@ typedef struct VP9_COMP { YV12_BUFFER_CONFIG last_frame_uf; TOKENEXTRA *tile_tok[4][1 << 6]; - unsigned int tok_count[4][1 << 6]; + uint32_t tok_count[4][1 << 6]; // Ambient reconstruction err target for force key frames int64_t ambient_err; @@ -440,7 +440,7 @@ typedef struct VP9_COMP { SPEED_FEATURES sf; - unsigned int max_mv_magnitude; + uint32_t max_mv_magnitude; int mv_step_param; int allow_comp_inter_inter; @@ -452,7 +452,7 @@ typedef struct VP9_COMP { // clips, and 300 for < HD clips. int encode_breakout; - unsigned char *segmentation_map; + uint8_t *segmentation_map; // segment threashold for encode breakout int segment_encode_breakout[MAX_SEGMENTS]; |