diff options
author | James Zern <jzern@google.com> | 2014-08-11 18:43:51 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-11 18:43:51 -0700 |
commit | 2ee221a2dc984ab02737ad9db4d59ac7e4512a19 (patch) | |
tree | 33314559e242e2815e04e3bd0acaefaf7cd7c4eb /vp9 | |
parent | 245e57c78e9d78db0caa493194f0c0ec9b05eacc (diff) | |
parent | c5a7eefdcac633a7109d9c3b3898f0a0be9866a3 (diff) | |
download | libvpx-2ee221a2dc984ab02737ad9db4d59ac7e4512a19.tar libvpx-2ee221a2dc984ab02737ad9db4d59ac7e4512a19.tar.gz libvpx-2ee221a2dc984ab02737ad9db4d59ac7e4512a19.tar.bz2 libvpx-2ee221a2dc984ab02737ad9db4d59ac7e4512a19.zip |
Merge "vp9_write_bit_buffer: fix function name typo"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_write_bit_buffer.c | 3 | ||||
-rw-r--r-- | vp9/encoder/vp9_write_bit_buffer.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index d638a2146..b0ff0fa81 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1216,7 +1216,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) { saved_wb = wb; vp9_wb_write_literal(&wb, 0, 16); // don't know in advance first part. size - uncompressed_hdr_size = vp9_rb_bytes_written(&wb); + uncompressed_hdr_size = vp9_wb_bytes_written(&wb); data += uncompressed_hdr_size; vp9_clear_system_state(); diff --git a/vp9/encoder/vp9_write_bit_buffer.c b/vp9/encoder/vp9_write_bit_buffer.c index 962d0ca56..6d55e84e8 100644 --- a/vp9/encoder/vp9_write_bit_buffer.c +++ b/vp9/encoder/vp9_write_bit_buffer.c @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <limits.h> #include "vp9/encoder/vp9_write_bit_buffer.h" -size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb) { +size_t vp9_wb_bytes_written(const struct vp9_write_bit_buffer *wb) { return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0); } diff --git a/vp9/encoder/vp9_write_bit_buffer.h b/vp9/encoder/vp9_write_bit_buffer.h index 073608d7f..59f9bbe30 100644 --- a/vp9/encoder/vp9_write_bit_buffer.h +++ b/vp9/encoder/vp9_write_bit_buffer.h @@ -11,8 +11,6 @@ #ifndef VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ #define VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ -#include <limits.h> - #include "vpx/vpx_integer.h" #ifdef __cplusplus @@ -24,7 +22,7 @@ struct vp9_write_bit_buffer { size_t bit_offset; }; -size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb); +size_t vp9_wb_bytes_written(const struct vp9_write_bit_buffer *wb); void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit); |