summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-08-02 14:14:22 -0700
committerJames Zern <jzern@google.com>2014-08-05 21:57:54 -0700
commitc5a7eefdcac633a7109d9c3b3898f0a0be9866a3 (patch)
tree23ac1de5326e1b8aa9df1174cb38a06961830498 /vp9
parent854acfbbea3893af848ec386e9742482101d4e01 (diff)
downloadlibvpx-c5a7eefdcac633a7109d9c3b3898f0a0be9866a3.tar
libvpx-c5a7eefdcac633a7109d9c3b3898f0a0be9866a3.tar.gz
libvpx-c5a7eefdcac633a7109d9c3b3898f0a0be9866a3.tar.bz2
libvpx-c5a7eefdcac633a7109d9c3b3898f0a0be9866a3.zip
vp9_write_bit_buffer: fix function name typo
vp9_rb_bytes_written -> vp9_wb_bytes_written + move limits.h from the header to the source file where it's needed Change-Id: Ifcdc856b4d4dcc2fff555ef11f86c86a0d83dab3
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_bitstream.c2
-rw-r--r--vp9/encoder/vp9_write_bit_buffer.c3
-rw-r--r--vp9/encoder/vp9_write_bit_buffer.h4
3 files changed, 4 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 2434aaff9..1391ba4a1 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1210,7 +1210,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_compute_update_table();
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);