Merge "segmentation: make local symbols static." into experimental

vp8/encoder/bitstream.c

@@ -1929,7 +1929,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
     // 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

@@ -160,7 +160,7 @@ static int cost_segmap(MACROBLOCKD *xd,
 
 }
 
-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

@@ -38,6 +38,6 @@ extern void vp8_set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_ma
 //
 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__ */