summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_entropymode.h
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-05-30 20:58:19 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-05-30 20:58:19 -0700
commit310bc1030afa740dd1196a995b7031d172ce13bd (patch)
tree4f16edf334c994576e4349d17b4b5bede54359ae /vp9/common/vp9_entropymode.h
parent7d549870f7c2390d57af98d5bd6d4b0e2e32793b (diff)
parenta433abbcad40ea2498bc3418f2ee8090e1b42ffb (diff)
downloadlibvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar
libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar.gz
libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar.bz2
libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.zip
Merge "Merge VP9_YMODES, VP9_UV_MODES, INTRA_MODE_COUNT and cousins." into experimental
Diffstat (limited to 'vp9/common/vp9_entropymode.h')
-rw-r--r--vp9/common/vp9_entropymode.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 120c81d4c..b7315603e 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -19,14 +19,14 @@
extern int vp9_mv_cont(const int_mv *l, const int_mv *a);
-extern const vp9_prob vp9_kf_default_bmode_probs[VP9_BINTRAMODES]
- [VP9_BINTRAMODES]
- [VP9_BINTRAMODES -1 ];
+extern const vp9_prob vp9_kf_default_bmode_probs[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 struct vp9_token vp9_intra_mode_encodings[VP9_BINTRAMODES];
+extern struct vp9_token vp9_intra_mode_encodings[VP9_INTRA_MODES];
/* Inter mode values do not start at zero */