shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix building with --disable-postproc" into cayuga

--- 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

--- 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"

--- 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"

--- 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"