ref: f6ff752c6321af8502be8fd0bc6b6192a825c76b
parent: 1c3398675fedbbf63e6bae2b25420669a07194a5
parent: 6ad272cb84001de3ef8e7f13d307eb08b5fc096a
author: Jingning Han <[email protected]>
date: Wed Oct 8 11:25:09 EDT 2014
Merge "Clean up header files in vp9_blockd.h and related files"
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -17,14 +17,10 @@
#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
-#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_common_data.h"
-#include "vp9/common/vp9_enums.h"
#include "vp9/common/vp9_filter.h"
-#include "vp9/common/vp9_idct.h"
#include "vp9/common/vp9_mv.h"
#include "vp9/common/vp9_scale.h"
-#include "vp9/common/vp9_seg_common.h"
#ifdef __cplusplus
extern "C" {--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -13,8 +13,8 @@
#include "vpx/vpx_integer.h"
-#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_common.h"
+#include "vp9/common/vp9_prob.h"
#include "vp9/common/vp9_scan.h"
#ifdef __cplusplus
--- a/vp9/common/vp9_quant_common.h
+++ b/vp9/common/vp9_quant_common.h
@@ -12,7 +12,7 @@
#define VP9_COMMON_VP9_QUANT_COMMON_H_
#include "vpx/vpx_codec.h"
-#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_seg_common.h"
#ifdef __cplusplus
extern "C" {