Merge "fix vp9_wb_write_bit uninitialized variable" into experimental

9062b92b · Jim Bankoski · Gerrit Code Review · 395ae7ab · c003b97d · 9062b92b
Commit 9062b92b authored Jun 06, 2013 by Jim Bankoski Committed by Gerrit Code Review Jun 06, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

vp9/encoder/vp9_write_bit_buffer.h vp9/encoder/vp9_write_bit_buffer.h +6 -2

No files found.
--- a/vp9/encoder/vp9_write_bit_buffer.h
+++ b/vp9/encoder/vp9_write_bit_buffer.h
@@ -26,8 +26,12 @@ static void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit) {
  const int off = wb->bit_offset;
  const int p = off / CHAR_BIT;
  const int q = CHAR_BIT - 1 - off % CHAR_BIT;
-  wb->bit_buffer[p] &= ~(1 << q);
-  wb->bit_buffer[p] |= bit << q;
+  if (q == CHAR_BIT -1) {
+    wb->bit_buffer[p] = bit << q;
+  } else {
+    wb->bit_buffer[p] &= ~(1 << q);
+    wb->bit_buffer[p] |= bit << q;
+  }
  wb->bit_offset = off + 1;
 }