commit 30ba4b41978888e8f1f9ca25fe5a2031f6ee31f2
author emilkeyder@google.com <emilkeyder@google.com> Wed Feb 22 21:07:55 2017 -0500
committer Emil Keyder <emilkeyder@google.com> Thu Feb 23 04:14:27 2017 +0000
tree e91db28f4164222d0848e7f9406e00c773af4dbb
parent 043de633acc089cd7528d1295a34c1c147bbd720

Fix some includes in global_motion.{c,h}.

Change-Id: I288890b964fda354ac58939f3a6b54a33f40666d

av1/encoder/global_motion.c

diff --git a/av1/encoder/global_motion.c b/av1/encoder/global_motion.c
index a213d8d..b55f86e 100644
--- a/av1/encoder/global_motion.c
+++ b/av1/encoder/global_motion.c
@@ -15,6 +15,8 @@
 #include <math.h>
 #include <assert.h>
 
+#include "av1/encoder/global_motion.h"
+
 #include "av1/common/warped_motion.h"
 
 #include "av1/encoder/segmentation.h"
@@ -30,6 +32,16 @@
 // Border over which to compute the global motion
 #define ERRORADV_BORDER 0
 
+const double gm_advantage_thresh[TRANS_TYPES] = {
+  1.00,  // Identity (not used)
+  0.85,  // Translation
+  0.75,  // Rot zoom
+  0.65,  // Affine
+  0.65,  // Hor Trapezoid
+  0.65,  // Ver Trapezoid
+  0.50,  // Homography
+};
+
 void convert_to_params(const double *params, int32_t *model) {
   int i;
   int alpha_present = 0;

av1/encoder/global_motion.h

diff --git a/av1/encoder/global_motion.h b/av1/encoder/global_motion.h
index b3893b5..141a16e 100644
--- a/av1/encoder/global_motion.h
+++ b/av1/encoder/global_motion.h
@@ -13,20 +13,14 @@
 #define AV1_ENCODER_GLOBAL_MOTION_H_
 
 #include "aom/aom_integer.h"
+#include "aom_scale/yv12config.h"
+#include "av1/common/mv.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-const double gm_advantage_thresh[TRANS_TYPES] = {
-  1.00,  // Identity (not used)
-  0.85,  // Translation
-  0.75,  // Rot zoom
-  0.65,  // Affine
-  0.65,  // Hor Trapezoid
-  0.65,  // Ver Trapezoid
-  0.50,  // Homography
-};
+extern const double gm_advantage_thresh[TRANS_TYPES];
 
 void convert_to_params(const double *params, int32_t *model);