Merge "Kludge to keep ANS building while porting from aom/master." into nextgenv2

e5868cdb · Pascal Massimino · Gerrit Code Review · 4c80804e · 92646508 · e5868cdb
Commit e5868cdb authored Sep 18, 2016 by Pascal Massimino Committed by Gerrit Code Review Sep 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

av1/encoder/bitwriter.h av1/encoder/bitwriter.h +4 -1

No files found.
--- 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