| commit | d6ea71cf73646f8355f58fa2fc08edc72ff87931 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Nov 07 10:24:14 2016 -0800 |
| committer | Yaowu Xu <yaowu@google.com> | Mon Nov 07 10:35:55 2016 -0800 |
| tree | c0a044298e009aef33cc7618fa96b73cb5f20e04 | |
| parent | 00a0e010f70c06e6b1f7473aee8e1034370db09e [diff] [blame] |
Resolve merge issues with --enable-pvq This commit resolves some compiling issues due to merge. Change-Id: I0eef8aa36c404e185e0b0004948a49307c360d3e
diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h index 3c496d9..2f2b93b 100644 --- a/av1/encoder/encodemb.h +++ b/av1/encoder/encodemb.h
@@ -13,6 +13,7 @@ #define AV1_ENCODER_ENCODEMB_H_ #include "./aom_config.h" +#include "av1/common/onyxc_int.h" #include "av1/encoder/block.h" #ifdef __cplusplus