]> granicus.if.org Git - libvpx/commitdiff
Fix building with --disable-postproc
authorJohn Koleszar <jkoleszar@google.com>
Mon, 1 Aug 2011 20:42:14 +0000 (16:42 -0400)
committerJohann <johannkoenig@google.com>
Mon, 1 Aug 2011 21:50:23 +0000 (17:50 -0400)
Change-Id: I7e6bc28e7974a376da747300744e0dd5dc1d21e9

vp8/common/onyxc_int.h
vp8/decoder/arm/arm_dsystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/temporal_filter.c

index 7fe8f7de9daad7ed2c2db01ce3b7bca70fc97549..936fa9f239b56ba4d8f73884c2211ad6c2ce0d20 100644 (file)
@@ -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 @@ typedef struct VP8_COMMON_RTCD
     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 @@ typedef struct VP8Common
 #if CONFIG_MULTITHREAD
     int processor_core_count;
 #endif
+#if CONFIG_POSTPROC
     struct postproc_state  postproc_state;
+#endif
 } VP8_COMMON;
 
 #endif
index 79e2e1ba9827a07f933188ad2dbbd13286bb4f1a..6ce471217d3cdf75b6a86369458bb1c8c7b3f77f 100644 (file)
@@ -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"
 
index 228850d9645bb93dcc6ed19bb5a620d50d4a2091..833020374922a8a40dd80674262816db21d6579f 100644 (file)
@@ -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"
index 19913a9b19736c7681346b2d44ddb6c4a6cab8a1..b9ade1c6cfa4f7e6a46f0fc79f68a63393e23d76 100644 (file)
@@ -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"