shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_write_bit_buffer: fix function name typo"

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -1216,7 +1216,7 @@

   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();

--- 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);

 }

--- 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 @@

   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);