ref: 141ab2d5d01dcc14e3588fba5315581a2478c99f
parent: c2da36548452c67085f36c7deb848d1c4d0c47b8
parent: a9415d2e4cb07797987b0ec23f2ed4534bfebf98
author: John Koleszar <jkoleszar@google.com>
date: Fri Jun 14 13:07:22 EDT 2013
Merge "Fix type mismatch in array definition"
--- a/vp9/common/vp9_modecont.c
+++ b/vp9/common/vp9_modecont.c
@@ -9,7 +9,7 @@
*/
-#include "vp9/common/vp9_entropy.h"
+#include "vp9/common/vp9_modecont.h"
const vp9_prob vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS]
[VP9_INTER_MODES - 1] = {--- a/vp9/common/vp9_modecont.h
+++ b/vp9/common/vp9_modecont.h
@@ -13,7 +13,7 @@
#include "vp9/common/vp9_entropy.h"
-extern const int vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS]
- [VP9_INTER_MODES - 1];
+extern const vp9_prob vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS]
+ [VP9_INTER_MODES - 1];
#endif // VP9_COMMON_VP9_MODECONT_H_