From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 31 Oct 2012 17:04:03 +0000 (-0700)
Subject: Merge "Change common vp8_ public symbol prefixes to vp9_." into experimental
X-Git-Tag: v1.3.0~1217^2~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbbd3e1832fd66f332e6d02c6a660f91ae7f072e;p=libvpx

Merge "Change common vp8_ public symbol prefixes to vp9_." into experimental
---

fbbd3e1832fd66f332e6d02c6a660f91ae7f072e
diff --cc vp8/encoder/encodeintra.c
index bd8539e4f,292ce3dd5..3cd450533
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@@ -73,9 -73,9 +73,9 @@@ void vp9_encode_intra4x4block(const VP8
  
    tx_type = get_tx_type(&x->e_mbd, b);
    if (tx_type != DCT_DCT) {
 -    vp9_fht_c(be->src_diff, 32, be->coeff, tx_type, 4);
 +    vp9_fht(be->src_diff, 32, be->coeff, tx_type, 4);
      vp9_ht_quantize_b_4x4(be, b, tx_type);
-     vp8_ihtllm_c(b->dqcoeff, b->diff, 32, tx_type, 4);
+     vp9_ihtllm_c(b->dqcoeff, b->diff, 32, tx_type, 4);
    } else {
      x->vp9_short_fdct4x4(be->src_diff, be->coeff, 32);
      x->quantize_b_4x4(be, b) ;
@@@ -205,10 -205,10 +205,10 @@@ void vp9_encode_intra8x8(const VP8_ENCO
  
      tx_type = get_tx_type(xd, xd->block + idx);
      if (tx_type != DCT_DCT) {
 -      vp9_fht_c(be->src_diff, 32, (x->block + idx)->coeff,
 +      vp9_fht(be->src_diff, 32, (x->block + idx)->coeff,
                  tx_type, 8);
        x->quantize_b_8x8(x->block + idx, xd->block + idx);
-       vp8_ihtllm_c(xd->block[idx].dqcoeff, xd->block[ib].diff, 32,
+       vp9_ihtllm_c(xd->block[idx].dqcoeff, xd->block[ib].diff, 32,
                     tx_type, 8);
      } else {
        x->vp9_short_fdct8x8(be->src_diff, (x->block + idx)->coeff, 32);