commit 674e9a7ca6dc9bedb8dcc9152289314069e0ce1f
author Alex Converse <aconverse@google.com> Mon Sep 19 21:50:55 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 19 21:50:56 2016 +0000
tree bc838f09e9dd38426b8b893c1305e02fd47df947
parent e5868cdba93c23ff4a4f29b0328e4d6cf7fbc987
parent e54fd03c5abee0e8dc996a551c7d47da08cb672c

Merge "Use the aom_writer type rather than the tag in calling code." into nextgenv2

av1/encoder/subexp.h

diff --git a/av1/encoder/subexp.h b/av1/encoder/subexp.h
index 93257a2..25750bb 100644
--- a/av1/encoder/subexp.h
+++ b/av1/encoder/subexp.h
@@ -16,14 +16,12 @@
 extern "C" {
 #endif
 
+#include "aom_dsp/bitwriter.h"
 #include "aom_dsp/prob.h"
 
-struct aom_writer;
+void av1_write_prob_diff_update(aom_writer *w, aom_prob newp, aom_prob oldp);
 
-void av1_write_prob_diff_update(struct aom_writer *w, aom_prob newp,
-                                aom_prob oldp);
-
-void av1_cond_prob_diff_update(struct aom_writer *w, aom_prob *oldp,
+void av1_cond_prob_diff_update(aom_writer *w, aom_prob *oldp,
                                const unsigned int ct[2]);
 
 int av1_prob_diff_update_savings_search(const unsigned int *ct, aom_prob oldp,