diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-14 04:31:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-14 04:31:39 -0700 |
| commit | 399a6cbcde18f6759e6ff6ac42af278129db4650 (patch) | |
| tree | bbfde85cfe1186f9653ae30bceb4a6fa6556a18d /vp9/common/vp9_entropymode.c | |
| parent | 626d06502f9df90bc796e4e107600242a5bca6c5 (diff) | |
| parent | 24f18e1c34406c023ae57448641374b6e655f18f (diff) | |
| download | libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar.gz libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar.bz2 libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.zip | |
Merge "Renaming vp9_token_struct to vp9_token and removing previous typedef." into experimental
Diffstat (limited to 'vp9/common/vp9_entropymode.c')
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 29855b633..61e0d02a4 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -283,19 +283,19 @@ const vp9_tree_index vp9_sub_mv_ref_tree[6] = { -ZERO4X4, -NEW4X4 }; -struct vp9_token_struct vp9_bmode_encodings[VP9_NKF_BINTRAMODES]; -struct vp9_token_struct vp9_kf_bmode_encodings[VP9_KF_BINTRAMODES]; -struct vp9_token_struct vp9_ymode_encodings[VP9_YMODES]; -struct vp9_token_struct vp9_sb_ymode_encodings[VP9_I32X32_MODES]; -struct vp9_token_struct vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES]; -struct vp9_token_struct vp9_kf_ymode_encodings[VP9_YMODES]; -struct vp9_token_struct vp9_uv_mode_encodings[VP9_UV_MODES]; -struct vp9_token_struct vp9_i8x8_mode_encodings[VP9_I8X8_MODES]; -struct vp9_token_struct vp9_mbsplit_encodings[VP9_NUMMBSPLITS]; - -struct vp9_token_struct vp9_mv_ref_encoding_array[VP9_MVREFS]; -struct vp9_token_struct vp9_sb_mv_ref_encoding_array[VP9_MVREFS]; -struct vp9_token_struct vp9_sub_mv_ref_encoding_array[VP9_SUBMVREFS]; +struct vp9_token vp9_bmode_encodings[VP9_NKF_BINTRAMODES]; +struct vp9_token vp9_kf_bmode_encodings[VP9_KF_BINTRAMODES]; +struct vp9_token vp9_ymode_encodings[VP9_YMODES]; +struct vp9_token vp9_sb_ymode_encodings[VP9_I32X32_MODES]; +struct vp9_token vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES]; +struct vp9_token vp9_kf_ymode_encodings[VP9_YMODES]; +struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES]; +struct vp9_token vp9_i8x8_mode_encodings[VP9_I8X8_MODES]; +struct vp9_token vp9_mbsplit_encodings[VP9_NUMMBSPLITS]; + +struct vp9_token vp9_mv_ref_encoding_array[VP9_MVREFS]; +struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_MVREFS]; +struct vp9_token vp9_sub_mv_ref_encoding_array[VP9_SUBMVREFS]; void vp9_init_mbmode_probs(VP9_COMMON *x) { unsigned int bct [VP9_YMODES] [2]; /* num Ymodes > num UV modes */ @@ -379,7 +379,7 @@ const vp9_tree_index vp9_switchable_interp_tree[VP9_SWITCHABLE_FILTERS*2-2] = { -0, 2, -1, -2 }; -struct vp9_token_struct vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; +struct vp9_token vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; #if CONFIG_ENABLE_6TAP const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = { SIXTAP, EIGHTTAP, EIGHTTAP_SHARP}; @@ -397,7 +397,7 @@ const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1] const vp9_tree_index vp9_switchable_interp_tree[VP9_SWITCHABLE_FILTERS*2-2] = { -0, -1, }; -struct vp9_token_struct vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; +struct vp9_token vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1] [VP9_SWITCHABLE_FILTERS-1] = { {248}, |