ref: a4d308a46856ae965c4363736a8ca2c4ba282a4f
parent: dd2e43c32be80ad365d8ad27bf24f1fa7dc48b77
parent: 7f6f07035edaf9bf4be95114defbd63d2ab7ad38
author: Paul Wilkins <paulwilkins@google.com>
date: Tue Oct 30 04:52:59 EDT 2012
Merge "segmentation: make local symbols static." into experimental
--- 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++) {--- 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;
--- 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__ */
--
⑨