shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9/encoder: fix function prototypes"

--- a/vp9/encoder/vp9_encodemv.h

+++ b/vp9/encoder/vp9_encodemv.h

@@ -20,7 +20,7 @@

 void vp9_entropy_mv_init();

-void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer* const);

+void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w);

 void vp9_encode_mv(VP9_COMP *cpi, vp9_writer* w, const MV* mv, const MV* ref,

                    const nmv_context* mvctx, int usehp);

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -253,7 +253,7 @@

 }

 // Update the buffer level: leaky bucket model.

-void vp9_update_buffer_level(VP9_COMP *const cpi, int encoded_frame_size) {

+void vp9_update_buffer_level(VP9_COMP *cpi, int encoded_frame_size) {

   const VP9_COMMON *const cm = &cpi->common;

   const VP9_CONFIG *oxcf = &cpi->oxcf;

   RATE_CONTROL *const rc = &cpi->rc;

@@ -269,7 +269,7 @@

   rc->buffer_level = MIN(rc->bits_off_target, oxcf->maximum_buffer_size);

 }

-int vp9_drop_frame(VP9_COMP *const cpi) {

+int vp9_drop_frame(VP9_COMP *cpi) {

   const VP9_CONFIG *oxcf = &cpi->oxcf;

   RATE_CONTROL *const rc = &cpi->rc;