commit ff00fc0f24a13f1302a6f8721c374033ece41acc
author Adrian Grange <agrange@google.com> Fri Mar 25 12:57:08 2016 -0700
committer Adrian Grange <agrange@google.com> Fri Mar 25 12:57:08 2016 -0700
tree 32de39730c1fceef123355cd8816c6bbddc6eaf4
parent 01dee0bba55ea79ffbe503ea05dda0e4388faae1

Change "VPX" to "AOM"

Change-Id: I6593a44de3b571193c2a4c8787ddf3b2fc24a268

aom_dsp/bitreader.c

diff --git a/aom_dsp/bitreader.c b/aom_dsp/bitreader.c
index 1420542..37e4672 100644
--- a/aom_dsp/bitreader.c
+++ b/aom_dsp/bitreader.c
@@ -47,7 +47,7 @@
   int shift = BD_VALUE_SIZE - CHAR_BIT - (count + CHAR_BIT);
 
   if (r->decrypt_cb) {
-    size_t n = VPXMIN(sizeof(r->clear_buffer), bytes_left);
+    size_t n = AOMMIN(sizeof(r->clear_buffer), bytes_left);
     r->decrypt_cb(r->decrypt_state, buffer, r->clear_buffer, (int)n);
     buffer = r->clear_buffer;
     buffer_start = r->clear_buffer;