diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-06-06 17:13:57 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-06 17:13:57 -0700 |
| commit | 9062b92b0fb9e49fbe22ad844abdfaf9f86530dd (patch) | |
| tree | 0f823c99e0cf4a129b351d6bfc6382e3477c669e /vp9/encoder | |
| parent | 395ae7abed0c5cf8ba62c37d06eb474c0df621e1 (diff) | |
| parent | c003b97d11e714b5fdca6657e7f57413a9514007 (diff) | |
| download | libvpx-9062b92b0fb9e49fbe22ad844abdfaf9f86530dd.tar libvpx-9062b92b0fb9e49fbe22ad844abdfaf9f86530dd.tar.gz libvpx-9062b92b0fb9e49fbe22ad844abdfaf9f86530dd.tar.bz2 libvpx-9062b92b0fb9e49fbe22ad844abdfaf9f86530dd.zip | |
Merge "fix vp9_wb_write_bit uninitialized variable" into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_write_bit_buffer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_write_bit_buffer.h b/vp9/encoder/vp9_write_bit_buffer.h index 18cf40366..98ad3f608 100644 --- 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; } |