shithub: libvpx

Download patch

ref: 42d5e31ef3712b2b8ff320e317b62fd2dc6ff717
parent: 976d0450ac86780e8141a5bf95611f647689f685
parent: 8ce9fb8d2143b487cd65d737896054730d700798
author: Paul Wilkins <paulwilkins@google.com>
date: Tue Oct 30 04:18:28 EDT 2012 

Merge "bitstream: give exported symbols a vp9_ prefix; make local symbols static." into experimental


--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -186,7 +186,7 @@
   return get_prob(n0, n0 + n1);
 }
 
-void update_skip_probs(VP8_COMP *cpi) {
+void vp9_update_skip_probs(VP8_COMP *cpi) {
   VP8_COMMON *const pc = &cpi->common;
   int prob_skip_false[3] = {0, 0, 0};
   int k;
@@ -197,7 +197,8 @@
   }
 }
 
-void update_switchable_interp_probs(VP8_COMP *cpi, vp8_writer* const bc) {
+static void update_switchable_interp_probs(VP8_COMP *cpi,
+                                           vp8_writer* const bc) {
   VP8_COMMON *const pc = &cpi->common;
   unsigned int branch_ct[32][2];
   int i, j;
@@ -1512,8 +1513,7 @@
   fclose(f);
 }
 
-
-void build_coeff_contexts(VP8_COMP *cpi) {
+static void build_coeff_contexts(VP8_COMP *cpi) {
   int i = 0, j, k;
 #ifdef ENTROPY_STATS
   int t = 0;
@@ -2263,7 +2263,7 @@
   if (pc->mb_no_coeff_skip) {
     int k;
 
-    update_skip_probs(cpi);
+    vp9_update_skip_probs(cpi);
     for (k = 0; k < MBSKIP_CONTEXTS; ++k)
       vp8_write_literal(&header_bc, pc->mbskip_pred_probs[k], 8);
   }
--- a/vp8/encoder/bitstream.h
+++ b/vp8/encoder/bitstream.h
@@ -24,4 +24,4 @@
 #endif
 #endif
 
-void update_skip_probs(VP8_COMP *cpi);
+void vp9_update_skip_probs(VP8_COMP *cpi);
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -280,7 +280,7 @@
   VP8_COMMON *cm = &cpi->common;
 
   if (cm->frame_type != KEY_FRAME) {
-    update_skip_probs(cpi);
+    vp9_update_skip_probs(cpi);
 
     if (cm->refresh_alt_ref_frame) {
       int k;