diff options
| author | James Zern <jzern@google.com> | 2013-08-22 18:40:34 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2013-08-23 19:16:49 -0700 |
| commit | c8ba8c513c5030ad5c7e03f547aad8f03614e92f (patch) | |
| tree | 57f61dd5a9e63d920d8d2843c4c313b465ad8311 /vp9/common/vp9_onyxc_int.h | |
| parent | 2c6ba737f83bd40214aae7510a9a6a8b4f8c30ce (diff) | |
| download | libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar.gz libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar.bz2 libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.zip | |
cosmetics: strip 'VP9_' from defines in vp9 only code
Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
Diffstat (limited to 'vp9/common/vp9_onyxc_int.h')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index d40f04f95..a669cc5e7 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -38,14 +38,14 @@ #define NUM_FRAME_CONTEXTS (1 << NUM_FRAME_CONTEXTS_LOG2) typedef struct frame_contexts { - vp9_prob y_mode_prob[BLOCK_SIZE_GROUPS][VP9_INTRA_MODES - 1]; - vp9_prob uv_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES - 1]; + vp9_prob y_mode_prob[BLOCK_SIZE_GROUPS][INTRA_MODES - 1]; + vp9_prob uv_mode_prob[INTRA_MODES][INTRA_MODES - 1]; vp9_prob partition_prob[NUM_FRAME_TYPES][NUM_PARTITION_CONTEXTS] [PARTITION_TYPES - 1]; vp9_coeff_probs_model coef_probs[TX_SIZES][BLOCK_TYPES]; - vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1] - [VP9_SWITCHABLE_FILTERS - 1]; - vp9_prob inter_mode_probs[INTER_MODE_CONTEXTS][VP9_INTER_MODES - 1]; + vp9_prob switchable_interp_prob[SWITCHABLE_FILTERS + 1] + [SWITCHABLE_FILTERS - 1]; + vp9_prob inter_mode_probs[INTER_MODE_CONTEXTS][INTER_MODES - 1]; vp9_prob intra_inter_prob[INTRA_INTER_CONTEXTS]; vp9_prob comp_inter_prob[COMP_INTER_CONTEXTS]; vp9_prob single_ref_prob[REF_CONTEXTS][2]; @@ -56,15 +56,15 @@ typedef struct frame_contexts { } FRAME_CONTEXT; typedef struct { - unsigned int y_mode[BLOCK_SIZE_GROUPS][VP9_INTRA_MODES]; - unsigned int uv_mode[VP9_INTRA_MODES][VP9_INTRA_MODES]; + unsigned int y_mode[BLOCK_SIZE_GROUPS][INTRA_MODES]; + unsigned int uv_mode[INTRA_MODES][INTRA_MODES]; unsigned int partition[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; vp9_coeff_count_model coef[TX_SIZES][BLOCK_TYPES]; unsigned int eob_branch[TX_SIZES][BLOCK_TYPES][REF_TYPES] [COEF_BANDS][PREV_COEF_CONTEXTS]; - unsigned int switchable_interp[VP9_SWITCHABLE_FILTERS + 1] - [VP9_SWITCHABLE_FILTERS]; - unsigned int inter_mode[INTER_MODE_CONTEXTS][VP9_INTER_MODES]; + unsigned int switchable_interp[SWITCHABLE_FILTERS + 1] + [SWITCHABLE_FILTERS]; + unsigned int inter_mode[INTER_MODE_CONTEXTS][INTER_MODES]; unsigned int intra_inter[INTRA_INTER_CONTEXTS][2]; unsigned int comp_inter[COMP_INTER_CONTEXTS][2]; unsigned int single_ref[REF_CONTEXTS][2][2]; |