History

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

John Koleszar committed 15 years ago

Commit 81da4172 parents b879198 06c3d5b4 files · +9 −2Browse files

Unified · Split

4 files
  1. vp8/common/onyxc_int.h +6 −0
  2. vp8/decoder/arm/arm_dsystemdependent.c +0 −1
  3. vp8/encoder/onyx_if.c +3 −0
  4. vp8/encoder/temporal_filter.c +0 −1
vp8/common/onyxc_int.h+6−0
@@ -19,7 +19,9 @@ · 18 unmodified lines
1919 #include "entropy.h"
2020 #include "idct.h"
2121 #include "recon.h"
22+#if CONFIG_POSTPROC
2223 #include "postproc.h"
24+#endif
2325
2426 /*#ifdef PACKET_TESTING*/
2527 #include "header.h"
@@ -75,7 +77,9 @@ typedef struct VP8_COMMON_RTCD · 49 unmodified lines
7577 vp8_recon_rtcd_vtable_t recon;
7678 vp8_subpix_rtcd_vtable_t subpix;
7779 vp8_loopfilter_rtcd_vtable_t loopfilter;
80+#if CONFIG_POSTPROC
7881 vp8_postproc_rtcd_vtable_t postproc;
82+#endif
7983 int flags;
8084 #else
8185 int unused;
@@ -201,7 +205,9 @@ typedef struct VP8Common · 119 unmodified lines
201205 #if CONFIG_MULTITHREAD
202206 int processor_core_count;
203207 #endif
208+#if CONFIG_POSTPROC
204209 struct postproc_state postproc_state;
210+#endif
205211 } VP8_COMMON;
206212
207213 #endif
vp8/decoder/arm/arm_dsystemdependent.c+0−1
@@ -13,7 +13,6 @@ · 12 unmodified lines
1313 #include "vpx_ports/arm.h"
1414 #include "vp8/common/blockd.h"
1515 #include "vp8/common/pragmas.h"
16−#include "vp8/common/postproc.h"
1716 #include "vp8/decoder/dequantize.h"
1817 #include "vp8/decoder/onyxd_int.h"
1918
vp8/encoder/onyx_if.c+3−0
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 */
1010
1111
12+#include "vpx_config.h"
1213 #include "vp8/common/onyxc_int.h"
1314 #include "onyx_int.h"
1415 #include "vp8/common/systemdependent.h"
@@ -24,7 +25,9 @@ · 9 unmodified lines
2425 #include "segmentation.h"
2526 #include "vp8/common/g_common.h"
2627 #include "vpx_scale/yv12extend.h"
28+#if CONFIG_POSTPROC
2729 #include "vp8/common/postproc.h"
30+#endif
2831 #include "vpx_mem/vpx_mem.h"
2932 #include "vp8/common/swapyv12buffer.h"
3033 #include "vp8/common/threading.h"
vp8/encoder/temporal_filter.c+0−1
@@ -24,7 +24,6 @@ · 23 unmodified lines
2424 #include "segmentation.h"
2525 #include "vp8/common/g_common.h"
2626 #include "vpx_scale/yv12extend.h"
27−#include "vp8/common/postproc.h"
2827 #include "vpx_mem/vpx_mem.h"
2928 #include "vp8/common/swapyv12buffer.h"
3029 #include "vp8/common/threading.h"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t