diff options
| author | James Zern <jzern@google.com> | 2014-10-16 01:09:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-16 01:09:15 -0700 |
| commit | 2c133152f7900ac51eff616bd2cf6a8ee46dfd57 (patch) | |
| tree | 521c3b47e3e1a32c20723e9b7c0ae2ea387c67a6 | |
| parent | 48ea5b719041df2988736c53e16f73cf6ed2e67a (diff) | |
| parent | 91657abef2e498454bd6483bb6d330d971eebbb4 (diff) | |
| download | libvpx-2c133152f7900ac51eff616bd2cf6a8ee46dfd57.tar libvpx-2c133152f7900ac51eff616bd2cf6a8ee46dfd57.tar.gz libvpx-2c133152f7900ac51eff616bd2cf6a8ee46dfd57.tar.bz2 libvpx-2c133152f7900ac51eff616bd2cf6a8ee46dfd57.zip | |
Merge "fix CONFIG_SPATIAL_SVC warning"
| -rw-r--r-- | vpx/vpx_encoder.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h index c6c7d0896..044243d6b 100644 --- a/vpx/vpx_encoder.h +++ b/vpx/vpx_encoder.h @@ -161,7 +161,9 @@ extern "C" { VPX_CODEC_STATS_PKT, /**< Two-pass statistics for this frame */ VPX_CODEC_FPMB_STATS_PKT, /**< first pass mb statistics for this frame */ VPX_CODEC_PSNR_PKT, /**< PSNR statistics for this frame */ -#if CONFIG_SPATIAL_SVC + // TODO(minghai): This is for testing purporses. The released library can't + // depend on vpx_config.h +#if defined(CONFIG_SPATIAL_SVC) && CONFIG_SPATIAL_SVC VPX_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/ VPX_CODEC_SPATIAL_SVC_LAYER_PSNR, /**< PSNR for each layer in this frame*/ #endif @@ -201,7 +203,9 @@ extern "C" { double psnr[4]; /**< PSNR, total/y/u/v */ } psnr; /**< data for PSNR packet */ vpx_fixed_buf_t raw; /**< data for arbitrary packets */ -#if CONFIG_SPATIAL_SVC + // TODO(minghai): This is for testing purporses. The released library + // can't depend on vpx_config.h +#if defined(CONFIG_SPATIAL_SVC) && CONFIG_SPATIAL_SVC size_t layer_sizes[VPX_SS_MAX_LAYERS]; struct vpx_psnr_pkt layer_psnr[VPX_SS_MAX_LAYERS]; #endif |