summaryrefslogtreecommitdiff
path: root/vp8/encoder/encodeframe.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2012-10-22 12:18:46 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2012-10-22 12:18:46 -0700
commit7906ed091ab5d16a7fbdc21109a034644aa6b9a3 (patch)
treef8fc3e6687ce6f5e6532778df19ca7f0b14fc7d2 /vp8/encoder/encodeframe.c
parent372e001d68c3a6c58613d8418933047e868a1e98 (diff)
parentf10465634bbbdc2cd251d8e12d965b91b6cecb83 (diff)
downloadlibvpx-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/encodeframe.c')
-rw-r--r--vp8/encoder/encodeframe.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index adfbfc79b..4658a7946 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1362,17 +1362,11 @@ static void encode_frame_internal(VP8_COMP *cpi) {
vp8_zero(cpi->MVcount_hp);
#endif
vp8_zero(cpi->coef_counts);
-#if CONFIG_HYBRIDTRANSFORM
vp8_zero(cpi->hybrid_coef_counts);
-#endif
vp8_zero(cpi->coef_counts_8x8);
-#if CONFIG_HYBRIDTRANSFORM8X8
vp8_zero(cpi->hybrid_coef_counts_8x8);
-#endif
vp8_zero(cpi->coef_counts_16x16);
-#if CONFIG_HYBRIDTRANSFORM16X16
vp8_zero(cpi->hybrid_coef_counts_16x16);
-#endif
vp8cx_frame_init_quantizer(cpi);