commit f11fb88269c8b04e89f3787d263bdc3d2d8dea74
author hui su <huisu@google.com> Mon Mar 27 14:56:33 2017 -0700
committer Hui Su <huisu@google.com> Tue Mar 28 16:55:47 2017 +0000
tree b352c6309223b482ce809bcc1cff4617b9c4ccc4
parent 233ef94776862d7b243f89fd07538f443e5b801c

Add av1_ prefix to fwd_txfm()

Change-Id: Ie18fd2b8a3caf3948748ee353fe41e37f5803ba3

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index cac0abf..1c5289f 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -627,7 +627,7 @@
 #if CONFIG_AOM_HIGHBITDEPTH
   fwd_txfm_param.bd = xd->bd;
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-    highbd_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
     if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
       if (LIKELY(!x->skip_block)) {
         quant_func_list[xform_quant_idx][QUANT_FUNC_HIGHBD](
@@ -643,7 +643,7 @@
     return;
   }
 #endif  // CONFIG_AOM_HIGHBITDEPTH
-  fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
+  av1_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
   if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
     if (LIKELY(!x->skip_block)) {
       quant_func_list[xform_quant_idx][QUANT_FUNC_LOWBD](
@@ -661,12 +661,12 @@
 #if CONFIG_AOM_HIGHBITDEPTH
   fwd_txfm_param.bd = xd->bd;
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-    highbd_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
-    highbd_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
   } else {
 #endif
-    fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
-    fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+    av1_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
+    av1_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
 #if CONFIG_AOM_HIGHBITDEPTH
   }
 #endif