From: Alex Converse <aconverse@google.com>
Date: Fri, 16 Sep 2016 23:47:49 +0000 (-0700)
Subject: Kludge to keep ANS building while porting from aom/master.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92646508380000358dc7bfefa1a42fc5fdd6e9e2;p=libvpx

Kludge to keep ANS building while porting from aom/master.

Change-Id: I9e74bdb94c5640aca025b11b6676e8a8c008f47e
---

diff --git a/av1/encoder/bitwriter.h b/av1/encoder/bitwriter.h
index 2deffebba..2247e30ad 100644
--- a/av1/encoder/bitwriter.h
+++ b/av1/encoder/bitwriter.h
@@ -16,6 +16,10 @@
 
 #include "./aom_config.h"
 #include "aom_dsp/prob.h"
+// Include bitwriter.h in the CONFIG_ANS to keep ANS building while
+// porting from VP10 style entropy coder abstraction to the aom/master style
+// entropy coder abstractions.
+#include "aom_dsp/bitwriter.h"
 
 #if CONFIG_ANS
 typedef struct BufAnsCoder BufAnsCoder;
@@ -25,7 +29,6 @@ typedef struct BufAnsCoder BufAnsCoder;
 #define aom_write_bit buf_uabs_write_bit
 #define aom_write_literal buf_uabs_write_literal
 #else
-#include "aom_dsp/bitwriter.h"
 #define aom_writer aom_writer
 #define aom_write aom_write
 #define aom_write_bit aom_write_bit