diff options
author | Daniel Kang <ddkang@google.com> | 2012-08-13 16:50:03 -0700 |
---|---|---|
committer | Daniel Kang <ddkang@google.com> | 2012-08-14 09:33:22 -0700 |
commit | fd084b2489e5c80a19b72f9b6264bda5eec67fb6 (patch) | |
tree | fbfbc0c47c0d9b8217ba59d94f0674185fd1e37d /vp8/encoder | |
parent | 8fb9f083f2a2e5409e6eed74c3ae5f68ae6ee524 (diff) | |
download | libvpx-fd084b2489e5c80a19b72f9b6264bda5eec67fb6.tar libvpx-fd084b2489e5c80a19b72f9b6264bda5eec67fb6.tar.gz libvpx-fd084b2489e5c80a19b72f9b6264bda5eec67fb6.tar.bz2 libvpx-fd084b2489e5c80a19b72f9b6264bda5eec67fb6.zip |
Shut up warnings added by -Wundef
Change-Id: I9c7ef4a75c37aa0e10df75e165e3066614c955ef
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/dct.h | 2 | ||||
-rw-r--r-- | vp8/encoder/encodeframe.c | 4 | ||||
-rw-r--r-- | vp8/encoder/firstpass.c | 2 | ||||
-rw-r--r-- | vp8/encoder/onyx_if.c | 2 | ||||
-rw-r--r-- | vp8/encoder/variance.h | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/vp8/encoder/dct.h b/vp8/encoder/dct.h index 2d7b61754..8d8a842ff 100644 --- a/vp8/encoder/dct.h +++ b/vp8/encoder/dct.h @@ -12,6 +12,8 @@ #ifndef __INC_DCT_H #define __INC_DCT_H +#include "vpx_config.h" + #define prototype_fdct(sym) void (sym)(short *input, short *output, int pitch) #if ARCH_X86 || ARCH_X86_64 diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 8778335a0..d3e0e4535 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -32,7 +32,7 @@ #include "vpx_ports/vpx_timer.h" #include "vp8/common/pred_common.h" -// #define DBG_PRNT_SEGMAP 1 +#define DBG_PRNT_SEGMAP 0 #if CONFIG_RUNTIME_CPU_DETECT #define RTCD(x) &cpi->common.rtcd.x @@ -1462,7 +1462,7 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, sum_intra_stats(cpi, x); vp8_tokenize_mb(cpi, &x->e_mbd, t, 0); } -#if CONFIG_NEWBESTREFMVvp8_tokenize_mb +#if CONFIG_NEWBESTREFMV else vp8_tokenize_mb(cpi, &x->e_mbd, t, 1); #endif diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index fdc85a95d..c1504f2ec 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -30,7 +30,7 @@ #include "vp8/common/quant_common.h" #include "encodemv.h" -// #define OUTPUT_FPF 1 +#define OUTPUT_FPF 0 #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 46e0689b2..bcbc85766 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2605,7 +2605,7 @@ void write_yuv_frame_to_file(YV12_BUFFER_CONFIG *frame) { } #endif -// #define WRITE_RECON_BUFFER 1 +#define WRITE_RECON_BUFFER 0 #if WRITE_RECON_BUFFER void write_cx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame) { diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index 0bfd93c2c..73a0a6b99 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -12,6 +12,8 @@ #ifndef VARIANCE_H #define VARIANCE_H +#include "vpx_config.h" + #define prototype_sad(sym)\ unsigned int (sym)\ (\ |