diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-22 12:18:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-22 12:18:46 -0700 |
| commit | 7906ed091ab5d16a7fbdc21109a034644aa6b9a3 (patch) | |
| tree | f8fc3e6687ce6f5e6532778df19ca7f0b14fc7d2 /vp8/encoder/onyx_if.c | |
| parent | 372e001d68c3a6c58613d8418933047e868a1e98 (diff) | |
| parent | f10465634bbbdc2cd251d8e12d965b91b6cecb83 (diff) | |
| download | libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar.gz libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.tar.bz2 libvpx-7906ed091ab5d16a7fbdc21109a034644aa6b9a3.zip | |
Merge "Merging the hybrid transform experiments" into experimental
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 0e46071a9..8f0a52be8 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3712,18 +3712,12 @@ static void encode_frame_to_data_rate update_reference_frames(cm); vp8_copy(cpi->common.fc.coef_counts, cpi->coef_counts); -#if CONFIG_HYBRIDTRANSFORM vp8_copy(cpi->common.fc.hybrid_coef_counts, cpi->hybrid_coef_counts); -#endif vp8_copy(cpi->common.fc.coef_counts_8x8, cpi->coef_counts_8x8); -#if CONFIG_HYBRIDTRANSFORM8X8 vp8_copy(cpi->common.fc.hybrid_coef_counts_8x8, cpi->hybrid_coef_counts_8x8); -#endif vp8_copy(cpi->common.fc.coef_counts_16x16, cpi->coef_counts_16x16); -#if CONFIG_HYBRIDTRANSFORM16X16 vp8_copy(cpi->common.fc.hybrid_coef_counts_16x16, cpi->hybrid_coef_counts_16x16); -#endif vp8_adapt_coef_probs(&cpi->common); if (cpi->common.frame_type != KEY_FRAME) { vp8_copy(cpi->common.fc.ymode_counts, cpi->ymode_count); |