summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2013-06-14 16:38:42 -0700
committerJohn Koleszar <jkoleszar@google.com>2013-06-14 16:38:42 -0700
commita9415d2e4cb07797987b0ec23f2ed4534bfebf98 (patch)
tree0dfa2e9102ddcbe0bf698c92c089084c4e8702fb /vp9/common
parent0f7a66e962027609bda58ffdae966713a88a216d (diff)
downloadlibvpx-a9415d2e4cb07797987b0ec23f2ed4534bfebf98.tar
libvpx-a9415d2e4cb07797987b0ec23f2ed4534bfebf98.tar.gz
libvpx-a9415d2e4cb07797987b0ec23f2ed4534bfebf98.tar.bz2
libvpx-a9415d2e4cb07797987b0ec23f2ed4534bfebf98.zip
Fix type mismatch in array definition
vp9_default_inter_mode_probs was being accessed with a different type than it was defined with. Ensure that its declaration is included prior to its definition. Change-Id: I2f963f513ab2f4e339f8a3c17e3d0f03749eba16
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_modecont.c2
-rw-r--r--vp9/common/vp9_modecont.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c
index bdb0049b4..5d92cfa00 100644
--- 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] = {
diff --git a/vp9/common/vp9_modecont.h b/vp9/common/vp9_modecont.h
index 1a3e993a5..3ec607947 100644
--- 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_