From: John Koleszar <jkoleszar@google.com>
Date: Fri, 14 Jun 2013 23:38:42 +0000 (-0700)
Subject: Fix type mismatch in array definition
X-Git-Tag: v1.3.0~1092^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9415d2e4cb07797987b0ec23f2ed4534bfebf98;p=libvpx

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
---

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_