Merge "include the arm header files in make dist" into cayuga
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 7fe8f7d..936fa9f 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -19,7 +19,9 @@
#include "entropy.h"
#include "idct.h"
#include "recon.h"
+#if CONFIG_POSTPROC
#include "postproc.h"
+#endif
/*#ifdef PACKET_TESTING*/
#include "header.h"
@@ -75,7 +77,9 @@
vp8_recon_rtcd_vtable_t recon;
vp8_subpix_rtcd_vtable_t subpix;
vp8_loopfilter_rtcd_vtable_t loopfilter;
+#if CONFIG_POSTPROC
vp8_postproc_rtcd_vtable_t postproc;
+#endif
int flags;
#else
int unused;
@@ -201,7 +205,9 @@
#if CONFIG_MULTITHREAD
int processor_core_count;
#endif
+#if CONFIG_POSTPROC
struct postproc_state postproc_state;
+#endif
} VP8_COMMON;
#endif
diff --git a/vp8/decoder/arm/arm_dsystemdependent.c b/vp8/decoder/arm/arm_dsystemdependent.c
index 79e2e1b..6ce4712 100644
--- a/vp8/decoder/arm/arm_dsystemdependent.c
+++ b/vp8/decoder/arm/arm_dsystemdependent.c
@@ -13,7 +13,6 @@
#include "vpx_ports/arm.h"
#include "vp8/common/blockd.h"
#include "vp8/common/pragmas.h"
-#include "vp8/common/postproc.h"
#include "vp8/decoder/dequantize.h"
#include "vp8/decoder/onyxd_int.h"
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 228850d..8330203 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -9,6 +9,7 @@
*/
+#include "vpx_config.h"
#include "vp8/common/onyxc_int.h"
#include "onyx_int.h"
#include "vp8/common/systemdependent.h"
@@ -24,7 +25,9 @@
#include "segmentation.h"
#include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h"
+#if CONFIG_POSTPROC
#include "vp8/common/postproc.h"
+#endif
#include "vpx_mem/vpx_mem.h"
#include "vp8/common/swapyv12buffer.h"
#include "vp8/common/threading.h"
diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c
index 19913a9..b9ade1c 100644
--- a/vp8/encoder/temporal_filter.c
+++ b/vp8/encoder/temporal_filter.c
@@ -24,7 +24,6 @@
#include "segmentation.h"
#include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h"
-#include "vp8/common/postproc.h"
#include "vpx_mem/vpx_mem.h"
#include "vp8/common/swapyv12buffer.h"
#include "vp8/common/threading.h"
