Index: source/libvpx/vp9/common/vp9_entropymode.h |
=================================================================== |
--- source/libvpx/vp9/common/vp9_entropymode.h (revision 240950) |
+++ source/libvpx/vp9/common/vp9_entropymode.h (working copy) |
@@ -37,22 +37,14 @@ |
extern const vp9_prob vp9_kf_uv_mode_prob[INTRA_MODES][INTRA_MODES - 1]; |
extern const vp9_prob vp9_kf_y_mode_prob[INTRA_MODES][INTRA_MODES] |
[INTRA_MODES - 1]; |
- |
+extern const vp9_prob vp9_kf_partition_probs[PARTITION_CONTEXTS] |
+ [PARTITION_TYPES - 1]; |
extern const vp9_tree_index vp9_intra_mode_tree[TREE_SIZE(INTRA_MODES)]; |
-extern struct vp9_token vp9_intra_mode_encodings[INTRA_MODES]; |
- |
extern const vp9_tree_index vp9_inter_mode_tree[TREE_SIZE(INTER_MODES)]; |
-extern struct vp9_token vp9_inter_mode_encodings[INTER_MODES]; |
- |
extern const vp9_tree_index vp9_partition_tree[TREE_SIZE(PARTITION_TYPES)]; |
-extern struct vp9_token vp9_partition_encodings[PARTITION_TYPES]; |
- |
extern const vp9_tree_index vp9_switchable_interp_tree |
[TREE_SIZE(SWITCHABLE_FILTERS)]; |
-extern struct vp9_token vp9_switchable_interp_encodings[SWITCHABLE_FILTERS]; |
-void vp9_entropy_mode_init(); |
- |
void vp9_setup_past_independence(struct VP9Common *cm); |
void vp9_init_mbmode_probs(struct VP9Common *cm); |