Fix build.

Change-Id: I27729a8631cffd54dfbae3ec0f07df7c883f7510

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index de4ff52..e3fcc73 100644 (file)
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -136,7 +136,7 @@ typedef enum {
   TX_SIZE_MAX                  // Number of different transforms available
 } TX_SIZE;
 
-#if CONFIG_HYBRIDTRANSFORM
+#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM
 typedef enum {
   DCT_DCT   = 0,                      // DCT  in both horizontal and vertical
   ADST_DCT  = 1,                      // ADST in horizontal, DCT in vertical

diff --git a/vp8/encoder/dct.h b/vp8/encoder/dct.h
index 8d8a842..5e71707 100644 (file)
--- a/vp8/encoder/dct.h
+++ b/vp8/encoder/dct.h
@@ -13,6 +13,7 @@
 #define __INC_DCT_H
 
 #include "vpx_config.h"
+#include "vp8/common/blockd.h"
 
 #define prototype_fdct(sym) void (sym)(short *input, short *output, int pitch)