diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-07 00:05:06 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-07 00:05:07 -0400 |
| commit | 6c8205d37eb47c0757f752505ada46bc4079c003 (patch) | |
| tree | 77aec2a18c2b9103b6d71ebc7163b5d552534930 /vp8/encoder/onyx_if.c | |
| parent | 2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e (diff) | |
| parent | 03973017a7138e196a3e2a8aecf4877780de7fd8 (diff) | |
| download | libvpx-6c8205d37eb47c0757f752505ada46bc4079c003.tar libvpx-6c8205d37eb47c0757f752505ada46bc4079c003.tar.gz libvpx-6c8205d37eb47c0757f752505ada46bc4079c003.tar.bz2 libvpx-6c8205d37eb47c0757f752505ada46bc4079c003.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I67cc3b490266f958a1b3a935ec08ee19d7b4f6a0
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index faa5bda1c..4a9b95a2e 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1269,11 +1269,17 @@ void vp8_set_speed_features(VP8_COMP *cpi) if (cpi->sf.improved_quant) { - cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, quantb); + cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, + quantb); + cpi->mb.quantize_b_pair = QUANTIZE_INVOKE(&cpi->rtcd.quantize, + quantb_pair); } else { - cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, fastquantb); + cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, + fastquantb); + cpi->mb.quantize_b_pair = QUANTIZE_INVOKE(&cpi->rtcd.quantize, + fastquantb_pair); } if (cpi->sf.improved_quant != last_improved_quant) vp8cx_init_quantizer(cpi); |