shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix the CONFIG_ALPHA build."

--- a/vp9/encoder/vp9_quantize.c

+++ b/vp9/encoder/vp9_quantize.c

@@ -242,10 +242,10 @@

   }

 #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

--- 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

-- 

⑨