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

674e9a7c · Alex Converse · Gerrit Code Review · e5868cdb · e54fd03c · 674e9a7c
Commit 674e9a7c authored Sep 19, 2016 by Alex Converse Committed by Gerrit Code Review Sep 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

av1/encoder/subexp.h av1/encoder/subexp.h +3 -5

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