Commit 141ab2d5 authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "Fix type mismatch in array definition"

Showing with 3 additions and 3 deletions
...@@ -9,7 +9,7 @@ ...@@ -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] const vp9_prob vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS]
[VP9_INTER_MODES - 1] = { [VP9_INTER_MODES - 1] = {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
extern const int vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS] extern const vp9_prob vp9_default_inter_mode_probs[INTER_MODE_CONTEXTS]
[VP9_INTER_MODES - 1]; [VP9_INTER_MODES - 1];
#endif // VP9_COMMON_VP9_MODECONT_H_ #endif // VP9_COMMON_VP9_MODECONT_H_
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment