From 45741e93512b4348139984d7be262a70d7dc6e2f Mon Sep 17 00:00:00 2001
From: "Nathan E. Egge" <negge@mozilla.com>
Date: Fri, 19 Aug 2016 15:31:43 -0400
Subject: [PATCH] Rename daala_read_tree_cdf() to daala_read_symbol().

Change-Id: I35f85bad88c637cea62577c546cdd5ced0e21bd6
---
 aom_dsp/bitreader.h       | 2 +-
 aom_dsp/daalaboolreader.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aom_dsp/bitreader.h b/aom_dsp/bitreader.h
index 1a0cc45ab..35976eeb1 100644
--- a/aom_dsp/bitreader.h
+++ b/aom_dsp/bitreader.h
@@ -140,7 +140,7 @@ static INLINE int aom_read_symbol(aom_reader *r, const aom_cdf_prob *cdf,
 static INLINE int aom_read_tree_cdf(aom_reader *r, const uint16_t *cdf,
                                     int nsymbs) {
 #if CONFIG_DAALA_EC
-  return daala_read_tree_cdf(r, cdf, nsymbs);
+  return daala_read_symbol(r, cdf, nsymbs);
 #else
   (void)r;
   (void)cdf;
diff --git a/aom_dsp/daalaboolreader.h b/aom_dsp/daalaboolreader.h
index f0a7e2542..cb7581ec8 100644
--- a/aom_dsp/daalaboolreader.h
+++ b/aom_dsp/daalaboolreader.h
@@ -66,8 +66,8 @@ static INLINE int daala_read_tree_bits(daala_reader *r,
   return -i;
 }
 
-static INLINE int daala_read_tree_cdf(daala_reader *r, const uint16_t *cdf,
-                                      int nsymbs) {
+static INLINE int daala_read_symbol(daala_reader *r, const uint16_t *cdf,
+                                    int nsymbs) {
   return od_ec_decode_cdf_q15(&r->ec, cdf, nsymbs, "aom");
 }