summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vp9/common/vp9_seg_common.h2
-rw-r--r--vp9/encoder/vp9_encoder.h6
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 6be61acb3..07d57fe32 100644
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -341,7 +341,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;
@@ -373,7 +373,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;
@@ -385,7 +385,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];