diff options
| author | Alex Converse <aconverse@google.com> | 2014-04-22 12:49:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-22 12:49:28 -0700 |
| commit | 9926f1566e356ee7ffd15c05445df1db64567285 (patch) | |
| tree | d036c7193f9b2c965b4cf09005b7b2137626d8d9 /vp9/encoder | |
| parent | 4a6abcb90090cd887162815bd645a1a060253446 (diff) | |
| parent | e6222b1a474403f8d7680b141b3183c40b303b97 (diff) | |
| download | libvpx-9926f1566e356ee7ffd15c05445df1db64567285.tar libvpx-9926f1566e356ee7ffd15c05445df1db64567285.tar.gz libvpx-9926f1566e356ee7ffd15c05445df1db64567285.tar.bz2 libvpx-9926f1566e356ee7ffd15c05445df1db64567285.zip | |
Merge "Fix the CONFIG_ALPHA build."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_quantize.c | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_quantize.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c index 2b2aa9add..9ae0148fe 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -242,10 +242,10 @@ void vp9_init_plane_quantizers(VP9_COMP *cpi, MACROBLOCK *x) { } #if CONFIG_ALPHA - x->plane[3].quant = cpi->a_quant[qindex]; - x->plane[3].quant_shift = cpi->a_quant_shift[qindex]; - x->plane[3].zbin = cpi->a_zbin[qindex]; - x->plane[3].round = cpi->a_round[qindex]; + x->plane[3].quant = quants->a_quant[qindex]; + x->plane[3].quant_shift = quants->a_quant_shift[qindex]; + x->plane[3].zbin = quants->a_zbin[qindex]; + x->plane[3].round = quants->a_round[qindex]; x->plane[3].zbin_extra = (int16_t)((cm->a_dequant[qindex][1] * zbin) >> 7); xd->plane[3].dequant = cm->a_dequant[qindex]; #endif diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h index 7a9388300..1835e9ccc 100644 --- a/vp9/encoder/vp9_quantize.h +++ b/vp9/encoder/vp9_quantize.h @@ -11,6 +11,7 @@ #ifndef VP9_ENCODER_VP9_QUANTIZE_H_ #define VP9_ENCODER_VP9_QUANTIZE_H_ +#include "./vpx_config.h" #include "vp9/encoder/vp9_block.h" #ifdef __cplusplus |