diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-20 22:40:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-20 22:40:51 -0700 |
| commit | 39342db13897120aeace93f19fb83a2551419a4f (patch) | |
| tree | 79b089b6fee0d9bad4bcde930c52d59e51b96b73 /vp9/common/vp9_entropymode.h | |
| parent | f66821afbbec498f6fc7186a4603a7540f7ee7a7 (diff) | |
| parent | bc7acb134b40d0358f4035854384614d3368489c (diff) | |
| download | libvpx-39342db13897120aeace93f19fb83a2551419a4f.tar libvpx-39342db13897120aeace93f19fb83a2551419a4f.tar.gz libvpx-39342db13897120aeace93f19fb83a2551419a4f.tar.bz2 libvpx-39342db13897120aeace93f19fb83a2551419a4f.zip | |
Merge "Consistent names for inter mode probabilities and encodings."
Diffstat (limited to 'vp9/common/vp9_entropymode.h')
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index 35ec9c412..613657be7 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -40,10 +40,10 @@ extern const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES] [VP9_INTRA_MODES - 1]; extern const vp9_tree_index vp9_intra_mode_tree[]; -extern const vp9_tree_index vp9_sb_mv_ref_tree[]; +extern const vp9_tree_index vp9_inter_mode_tree[]; extern struct vp9_token vp9_intra_mode_encodings[VP9_INTRA_MODES]; -extern struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_INTER_MODES]; +extern struct vp9_token vp9_inter_mode_encodings[VP9_INTER_MODES]; // probability models for partition information extern const vp9_tree_index vp9_partition_tree[]; |