commit 7f6f07035edaf9bf4be95114defbd63d2ab7ad38
author Ronald S. Bultje <rbultje@google.com> Mon Oct 29 21:39:44 2012 -0700
committer Ronald S. Bultje <rbultje@google.com> Mon Oct 29 21:39:44 2012 -0700
tree d91879f648c0f58ffc8c0f8bcbe5904258493797
parent 68d07ba116fe1de5327335ed2a2c702f1bf10dfd

segmentation: make local symbols static.

Change-Id: Ia30924dc095663b04794902522308d822c1a5ad0

vp8/encoder/bitstream.c

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 7b38227..92ef469 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1929,7 +1929,7 @@
     // If it is, then indicate the method that will be used.
     if (xd->update_mb_segmentation_map) {
       // Select the coding strategy (temporal or spatial)
-      choose_segmap_coding_method(cpi);
+      vp9_choose_segmap_coding_method(cpi);
       // Send the tree probabilities used to decode unpredicted
       // macro-block segments
       for (i = 0; i < MB_FEATURE_TREE_PROBS; i++) {

vp8/encoder/segmentation.c

diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c
index f6f3f31..4071839 100644
--- a/vp8/encoder/segmentation.c
+++ b/vp8/encoder/segmentation.c
@@ -160,7 +160,7 @@
 
 }
 
-void choose_segmap_coding_method(VP8_COMP *cpi) {
+void vp9_choose_segmap_coding_method(VP8_COMP *cpi) {
   VP8_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &cpi->mb.e_mbd;
 

vp8/encoder/segmentation.h

diff --git a/vp8/encoder/segmentation.h b/vp8/encoder/segmentation.h
index 80e09fa..88217df 100644
--- a/vp8/encoder/segmentation.h
+++ b/vp8/encoder/segmentation.h
@@ -38,6 +38,6 @@
 //
 extern void vp8_set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta);
 
-extern void choose_segmap_coding_method(VP8_COMP *cpi);
+extern void vp9_choose_segmap_coding_method(VP8_COMP *cpi);
 
 #endif /* __INC_SEGMENTATION_H__ */